diff --git a/make/CompileDemos.gmk b/make/CompileDemos.gmk
index 599ce9842e4..6c751552e50 100644
--- a/make/CompileDemos.gmk
+++ b/make/CompileDemos.gmk
@@ -183,7 +183,7 @@ $(eval $(call SetupBuildDemo, SwingSet2, \
 ))
 
 $(eval $(call SetupBuildDemo, Font2DTest, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked serial cast this-escape, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked serial cast this-escape dangling-doc-comments, \
     DEMO_SUBDIR := jfc, \
 ))
 
diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index 616999f2736..7ce4038f641 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -675,7 +675,7 @@ DOCS_REFERENCE_JAVADOC := @DOCS_REFERENCE_JAVADOC@
 SOURCE_REVISION_TRACKER := $(SUPPORT_OUTPUTDIR)/src-rev/source-revision-tracker
 
 # Interim langtools modules and arguments
-INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc
+INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.internal.md jdk.javadoc
 INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES))
 INTERIM_LANGTOOLS_ADD_EXPORTS := \
     --add-exports java.base/sun.reflect.annotation=jdk.compiler.interim \
diff --git a/make/data/docs-resources/resources/jdk-default.css b/make/data/docs-resources/resources/jdk-default.css
index 371f3ba00b9..29f4f43764f 100644
--- a/make/data/docs-resources/resources/jdk-default.css
+++ b/make/data/docs-resources/resources/jdk-default.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,56 +23,62 @@
  * questions.
  */
 
+@import url('../api/resource-files/fonts/dejavu.css');
+
 body {
-  margin: 2em 2em;
   font-family: DejaVu Sans, Bitstream Vera Sans, Luxi Sans, Verdana, Arial, Helvetica, sans-serif;
   font-size: 10pt;
+  margin: 0;
+  padding: 0;
+  height: 100%;
+  width: 100%;
+  min-width: 100%;
   line-height: 1.4;
 }
 
 pre, code, tt {
-  font-family: DejaVu Sans Mono, Bitstream Vera Sans Mono, Luxi Mono,
-    Courier New, monospace;
+    font-family: DejaVu Sans Mono, Bitstream Vera Sans Mono, Luxi Mono, Courier New, monospace;
+}
+
+main, footer {
+  margin: 16px 27px;
+}
+
+/* Adjust horizontal margin for content elements outside of main element */
+:is(body, header) > :is(nav, h1, h2, h3, h4, h5, h6, p, .sub-title) {
+    margin-left: 27px;
+    margin-right: 27px;
 }
 
 blockquote {
-  margin: 1.5ex 0em 1.5ex 2em;
+  margin: 1.5ex 0 1.5ex 2em;
 }
 
 p {
-  padding: 0pt;
-  margin: 1ex 0em;
+  margin-top: 1ex;
+  margin-bottom: 1ex;
 }
 
-p:first-child, pre:first-child { margin-top: 0pt; }
-
-h1 {
-  font-weight: bold;
-  padding: 0pt;
-  margin: 2ex .5ex 1ex 0pt;
+dd > p:first-child, pre:first-child {
+  margin-top: 0;
 }
 
 h1:first-child, h2:first-child {
-  margin-top: 0ex;
+  margin-top: 0;
 }
 
-h2 {
-  font-weight: bold;
-  padding: 0pt;
-  margin: 2ex 0pt 1ex 0pt;
+h1, h2 {
+  margin-top: 2ex;
+  margin-bottom: 1ex;
 }
 
-h3 {
-  font-weight: bold;
-  padding: 0pt;
-  margin: 1.5ex 0pt 1ex 0pt;
+h3, h4, h5 {
+  margin-top: 1.5ex;
+  margin-bottom: 1ex;
 }
 
 h4, h5 {
   font-size: 100%;
-  font-weight: bold;
-  padding: 0pt;
-  margin: 1.5ex 0pt 1ex 0pt;
 }
 
 .subtitle {
@@ -100,7 +106,7 @@ a[href]:hover {
 }
 
 a img {
-  border-width: 0px;
+  border-width: 0;
 }
 
 img {
@@ -154,9 +160,9 @@ table.centered td {
 
 .draft-header {
   text-align: center;
-  font-size: 80%;
+  font-size: 11.2px;
   padding: 6px;
-  margin: -2.5em -2.5em 2.5em -2.5em;
+  line-height: initial;
 }
 
 .legal-footer {
@@ -183,29 +189,31 @@ nav#TOC ul ul li::before {
     content: " \2022  "
 }
 
-header#title-block-header {
-    margin-top:-2em;
+/* Rules below replicate sizing of navigation bar in API docs */
+header#title-block-header div.navbar {
+    padding: 0 20px 0 26px;
+    margin-bottom: 30px;
+    background-color: #4D7A97;
+    color: #FFFFFF;
+    height: 44px;
+    overflow: hidden;
+    font-size: 0.857em;
+    line-height: initial;
+    display: flex;
+    flex-direction: row-reverse;
+    align-items: center;
 }
 
-header#title-block-header div.navbar {
-    margin: 0 -2.5em 2.5em -2.5em;
-    padding: 0 2.5em;
-    background-color:#4D7A97;
-    color:#FFFFFF;
-    float:left;
-    width:100%;
-    clear:right;
-    min-height:2.8em;
-    padding-top:10px;
-    overflow:hidden;
-    font-size:12px;
+header#title-block-header div.navbar nav {
+    flex: 1 1 auto;
+    font-size: 12px;
+    white-space: nowrap;
 }
 
 header#title-block-header div.navbar div {
-    float:right;
-    font-size:11px;
-    height:2.9em;
-    margin: auto 0;
+    flex: 0 0 auto;
+    font-size: 10.978px;
+    white-space: nowrap;
 }
 
 header#title-block-header ul {
diff --git a/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/FileTreeCreator.java b/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/FileTreeCreator.java
index 385903e676f..f8fd111587c 100644
--- a/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/FileTreeCreator.java
+++ b/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/FileTreeCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@ public FileTreeCreator(Path startDir, Vector<BuildConfig> allConfigs, WinGammaPl
       attributes.push(new DirAttributes());
    }
 
-   public class DirAttributes {
+   public static class DirAttributes {
 
       private HashSet<BuildConfig> ignores;
       private HashSet<BuildConfig> disablePch;
diff --git a/make/jdk/src/classes/build/tools/intpoly/FieldGen.java b/make/jdk/src/classes/build/tools/intpoly/FieldGen.java
index a65150ac421..234f5cfce0d 100644
--- a/make/jdk/src/classes/build/tools/intpoly/FieldGen.java
+++ b/make/jdk/src/classes/build/tools/intpoly/FieldGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -778,7 +778,7 @@ private String generate(FieldParams params) throws IOException {
         result.appendLine("}");
 
         result.appendLine("@Override");
-        result.appendLine("protected void mult(long[] a, long[] b, long[] r) {");
+        result.appendLine("protected int mult(long[] a, long[] b, long[] r) {");
         result.incrIndent();
         for (int i = 0; i < 2 * params.getNumLimbs() - 1; i++) {
             result.appendIndent();
@@ -804,6 +804,9 @@ private String generate(FieldParams params) throws IOException {
             }
         }
         result.append(");\n");
+        result.appendIndent();
+        result.append("return 0;");
+        result.appendLine();
         result.decrIndent();
         result.appendLine("}");
 
@@ -833,7 +836,7 @@ private String generate(FieldParams params) throws IOException {
         //      }
         //  }
         result.appendLine("@Override");
-        result.appendLine("protected void square(long[] a, long[] r) {");
+        result.appendLine("protected int square(long[] a, long[] r) {");
         result.incrIndent();
         for (int i = 0; i < 2 * params.getNumLimbs() - 1; i++) {
             result.appendIndent();
@@ -874,6 +877,9 @@ private String generate(FieldParams params) throws IOException {
             }
         }
         result.append(");\n");
+        result.appendIndent();
+        result.append("return 0;");
+        result.appendLine();
         result.decrIndent();
         result.appendLine("}");
 
diff --git a/make/jdk/src/classes/build/tools/taglet/JSpec.java b/make/jdk/src/classes/build/tools/taglet/JSpec.java
index ff8abc46ffd..fda372c8b01 100644
--- a/make/jdk/src/classes/build/tools/taglet/JSpec.java
+++ b/make/jdk/src/classes/build/tools/taglet/JSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,8 @@
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 import javax.lang.model.element.Element;
 
 import com.sun.source.doctree.DocTree;
@@ -157,7 +159,10 @@ public String toString(List<? extends DocTree> tags, Element elem) {
                     continue;
             }
 
-            String tagText = contents.toString().trim();
+            String tagText = contents.stream()
+                    .map(Object::toString)
+                    .collect(Collectors.joining())
+                    .trim();
             Matcher m = TAG_PATTERN.matcher(tagText);
             if (m.find()) {
                 String chapter = m.group("chapter");
diff --git a/make/jdk/src/classes/build/tools/taglet/ToolGuide.java b/make/jdk/src/classes/build/tools/taglet/ToolGuide.java
index f3ce80cf241..af38e0a765c 100644
--- a/make/jdk/src/classes/build/tools/taglet/ToolGuide.java
+++ b/make/jdk/src/classes/build/tools/taglet/ToolGuide.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,8 @@
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 import javax.lang.model.element.Element;
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
@@ -105,8 +107,11 @@ public String toString(List<? extends DocTree> tags, Element elem) {
                 continue;
             }
 
-            UnknownBlockTagTree blockTag = (UnknownBlockTagTree)tag;
-            String tagText = blockTag.getContent().toString().trim();
+            UnknownBlockTagTree blockTag = (UnknownBlockTagTree) tag;
+            String tagText = blockTag.getContent().stream()
+                    .map(Object::toString)
+                    .collect(Collectors.joining())
+                    .trim();
             Matcher m = TAG_PATTERN.matcher(tagText);
             if (m.matches()) {
                 String name = m.group("name");
diff --git a/make/modules/java.base/Java.gmk b/make/modules/java.base/Java.gmk
index 5820c280fe9..cbe6eecf187 100644
--- a/make/modules/java.base/Java.gmk
+++ b/make/modules/java.base/Java.gmk
@@ -27,7 +27,7 @@
 # new warning is added to javac, it can be temporarily added to the
 # disabled warnings list.
 #
-# DISABLED_WARNINGS_java +=
+DISABLED_WARNINGS_java += dangling-doc-comments
 
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'
diff --git a/make/modules/jdk.incubator.vector/Java.gmk b/make/modules/jdk.incubator.vector/Java.gmk
index a2013179ace..6cd5301428f 100644
--- a/make/modules/jdk.incubator.vector/Java.gmk
+++ b/make/modules/jdk.incubator.vector/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,4 +23,6 @@
 # questions.
 #
 
+DISABLED_WARNINGS_java += dangling-doc-comments
+
 DOCLINT += -Xdoclint:all/protected
diff --git a/make/modules/jdk.internal.md/Java.gmk b/make/modules/jdk.internal.md/Java.gmk
new file mode 100644
index 00000000000..2a850f55637
--- /dev/null
+++ b/make/modules/jdk.internal.md/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+COPY += .txt
diff --git a/make/modules/jdk.jpackage/Java.gmk b/make/modules/jdk.jpackage/Java.gmk
index acb8529f9ef..9d31e5417e9 100644
--- a/make/modules/jdk.jpackage/Java.gmk
+++ b/make/modules/jdk.jpackage/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+DISABLED_WARNINGS_java += dangling-doc-comments
+
 COPY += .gif .png .txt .spec .script .prerm .preinst \
     .postrm .postinst .list .sh .desktop .copyright .control .plist .template \
     .icns .scpt .wxs .wxl .wxi .ico .bmp .tiff .service
diff --git a/make/modules/jdk.unsupported/Java.gmk b/make/modules/jdk.unsupported/Java.gmk
new file mode 100644
index 00000000000..fc8b2f832d7
--- /dev/null
+++ b/make/modules/jdk.unsupported/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DISABLED_WARNINGS_java += dangling-doc-comments
diff --git a/make/test/BuildMicrobenchmark.gmk b/make/test/BuildMicrobenchmark.gmk
index 3d6ec9950d7..7b65e89610e 100644
--- a/make/test/BuildMicrobenchmark.gmk
+++ b/make/test/BuildMicrobenchmark.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -95,7 +95,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JDK_MICROBENCHMARK, \
     SMALL_JAVA := false, \
     CLASSPATH := $(JMH_COMPILE_JARS), \
     DISABLED_WARNINGS := restricted this-escape processing rawtypes cast \
-        serial preview, \
+        serial preview dangling-doc-comments, \
     SRC := $(MICROBENCHMARK_SRC), \
     BIN := $(MICROBENCHMARK_CLASSES), \
     JAVAC_FLAGS := \
@@ -109,6 +109,8 @@ $(eval $(call SetupJavaCompilation, BUILD_JDK_MICROBENCHMARK, \
         --add-exports java.base/jdk.internal.vm=ALL-UNNAMED \
         --add-exports java.base/sun.invoke.util=ALL-UNNAMED \
         --add-exports java.base/sun.security.util=ALL-UNNAMED \
+        --add-exports java.base/sun.security.util.math=ALL-UNNAMED \
+        --add-exports java.base/sun.security.util.math.intpoly=ALL-UNNAMED \
         --enable-preview \
         -XDsuppressNotes \
         -processor org.openjdk.jmh.generators.BenchmarkProcessor, \
diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index a82a1b396e0..1b8b9801f3c 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -16230,7 +16230,7 @@ instruct partialSubtypeCheckConstSuper(iRegP_R4 sub, iRegP_R0 super_reg, immP su
   effect(KILL cr, TEMP tempR1, TEMP tempR2, TEMP tempR3, TEMP vtemp);
 
   ins_cost(700);  // smaller than the next version
-  format %{ "partialSubtypeCheck $result, $sub, super" %}
+  format %{ "partialSubtypeCheck $result, $sub, $super_reg, $super_con" %}
 
   ins_encode %{
     bool success = false;
diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index ff55951bd7d..b0249ac3344 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -656,39 +656,35 @@ class Assembler : public AbstractAssembler {
 
 #undef INSN
 
-#define INSN(NAME, op)                                                                \
-  void NAME(Register Rd, const int32_t offset) {                                      \
-    guarantee(is_simm21(offset) && ((offset % 2) == 0), "offset is invalid.");        \
-    unsigned insn = 0;                                                                \
-    patch((address)&insn, 6, 0, op);                                                  \
-    patch_reg((address)&insn, 7, Rd);                                                 \
-    patch((address)&insn, 19, 12, (uint32_t)((offset >> 12) & 0xff));                 \
-    patch((address)&insn, 20, (uint32_t)((offset >> 11) & 0x1));                      \
-    patch((address)&insn, 30, 21, (uint32_t)((offset >> 1) & 0x3ff));                 \
-    patch((address)&insn, 31, (uint32_t)((offset >> 20) & 0x1));                      \
-    emit(insn);                                                                       \
+ private:
+  // All calls and jumps must go via MASM.
+  // Format J-type
+  void _jal(Register Rd, const int32_t offset) {
+    guarantee(is_simm21(offset) && ((offset % 2) == 0), "offset is invalid.");
+    unsigned insn = 0;
+    patch((address)&insn, 6, 0, 0b1101111);
+    patch_reg((address)&insn, 7, Rd);
+    patch((address)&insn, 19, 12, (uint32_t)((offset >> 12) & 0xff));
+    patch((address)&insn, 20, (uint32_t)((offset >> 11) & 0x1));
+    patch((address)&insn, 30, 21, (uint32_t)((offset >> 1) & 0x3ff));
+    patch((address)&insn, 31, (uint32_t)((offset >> 20) & 0x1));
+    emit(insn);
   }
 
-  INSN(jal, 0b1101111);
-
-#undef INSN
-
-#define INSN(NAME, op, funct)                                                         \
-  void NAME(Register Rd, Register Rs, const int32_t offset) {                         \
-    guarantee(is_simm12(offset), "offset is invalid.");                               \
-    unsigned insn = 0;                                                                \
-    patch((address)&insn, 6, 0, op);                                                  \
-    patch_reg((address)&insn, 7, Rd);                                                 \
-    patch((address)&insn, 14, 12, funct);                                             \
-    patch_reg((address)&insn, 15, Rs);                                                \
-    int32_t val = offset & 0xfff;                                                     \
-    patch((address)&insn, 31, 20, val);                                               \
-    emit(insn);                                                                       \
+  // Format I-type
+  void _jalr(Register Rd, Register Rs, const int32_t offset) {
+    guarantee(is_simm12(offset), "offset is invalid.");
+    unsigned insn = 0;
+    patch((address)&insn, 6, 0, 0b1100111);
+    patch_reg((address)&insn, 7, Rd);
+    patch((address)&insn, 14, 12, 0b000);
+    patch_reg((address)&insn, 15, Rs);
+    int32_t val = offset & 0xfff;
+    patch((address)&insn, 31, 20, val);
+    emit(insn);
   }
 
-  INSN(_jalr, 0b1100111, 0b000);
-
-#undef INSN
+ public:
 
   enum barrier {
     i = 0b1000, o = 0b0100, r = 0b0010, w = 0b0001,
@@ -2294,21 +2290,23 @@ enum Nf {
 
 #undef INSN
 
-#define INSN(NAME, funct4, op)                                                               \
-  void NAME(Register Rs1) {                                                                  \
-    assert_cond(Rs1 != x0);                                                                  \
-    uint16_t insn = 0;                                                                       \
-    c_patch((address)&insn, 1, 0, op);                                                       \
-    c_patch_reg((address)&insn, 2, x0);                                                      \
-    c_patch_reg((address)&insn, 7, Rs1);                                                     \
-    c_patch((address)&insn, 15, 12, funct4);                                                 \
-    emit_int16(insn);                                                                        \
+ private:
+  // All calls and jumps must go via MASM.
+  // Format CR, c.jr/c.jalr
+  // Note C instruction can't be changed, i.e. relocation patching.
+  template <uint8_t InstructionType, uint8_t FunctionType>
+  void c_cr_if(Register Rs1) {
+    assert_cond(Rs1 != x0);
+    uint16_t insn = 0;
+    c_patch((address)&insn, 1, 0, FunctionType);
+    c_patch_reg((address)&insn, 2, x0);
+    c_patch_reg((address)&insn, 7, Rs1);
+    c_patch((address)&insn, 15, 12, InstructionType);
+    emit_int16(insn);
   }
 
-  INSN(c_jr,   0b1000, 0b10);
-  INSN(c_jalr, 0b1001, 0b10);
-
-#undef INSN
+  void c_jr(Register Rs1)   { c_cr_if<0b1000, 0b10>(Rs1); }
+  void c_jalr(Register Rs1) { c_cr_if<0b1001, 0b10>(Rs1); }
 
   typedef void (Assembler::* j_c_insn)(address dest);
   typedef void (Assembler::* compare_and_branch_c_insn)(Register Rs1, address dest);
@@ -2331,35 +2329,36 @@ enum Nf {
     }
   }
 
-#define INSN(NAME, funct3, op)                                                               \
-  void NAME(int32_t offset) {                                                                \
-    assert(is_simm12(offset) && ((offset % 2) == 0), "invalid encoding");                    \
-    uint16_t insn = 0;                                                                       \
-    c_patch((address)&insn, 1, 0, op);                                                       \
-    c_patch((address)&insn, 2, 2, (offset & nth_bit(5)) >> 5);                               \
-    c_patch((address)&insn, 5, 3, (offset & right_n_bits(4)) >> 1);                          \
-    c_patch((address)&insn, 6, 6, (offset & nth_bit(7)) >> 7);                               \
-    c_patch((address)&insn, 7, 7, (offset & nth_bit(6)) >> 6);                               \
-    c_patch((address)&insn, 8, 8, (offset & nth_bit(10)) >> 10);                             \
-    c_patch((address)&insn, 10, 9, (offset & right_n_bits(10)) >> 8);                        \
-    c_patch((address)&insn, 11, 11, (offset & nth_bit(4)) >> 4);                             \
-    c_patch((address)&insn, 12, 12, (offset & nth_bit(11)) >> 11);                           \
-    c_patch((address)&insn, 15, 13, funct3);                                                 \
-    emit_int16(insn);                                                                        \
-  }                                                                                          \
-  void NAME(address dest) {                                                                  \
-    assert_cond(dest != nullptr);                                                            \
-    int64_t distance = dest - pc();                                                          \
-    assert(is_simm12(distance) && ((distance % 2) == 0), "invalid encoding");                \
-    c_j(distance);                                                                           \
-  }                                                                                          \
-  void NAME(Label &L) {                                                                      \
-    wrap_label(L, &Assembler::NAME);                                                         \
+  // Format CJ, c.j (c.jal)
+  // Note C instruction can't be changed, i.e. relocation patching.
+  void c_j(int32_t offset) {
+    assert(is_simm12(offset) && ((offset % 2) == 0), "invalid encoding");
+    uint16_t insn = 0;
+    c_patch((address)&insn, 1, 0, 0b01);
+    c_patch((address)&insn, 2, 2, (offset & nth_bit(5)) >> 5);
+    c_patch((address)&insn, 5, 3, (offset & right_n_bits(4)) >> 1);
+    c_patch((address)&insn, 6, 6, (offset & nth_bit(7)) >> 7);
+    c_patch((address)&insn, 7, 7, (offset & nth_bit(6)) >> 6);
+    c_patch((address)&insn, 8, 8, (offset & nth_bit(10)) >> 10);
+    c_patch((address)&insn, 10, 9, (offset & right_n_bits(10)) >> 8);
+    c_patch((address)&insn, 11, 11, (offset & nth_bit(4)) >> 4);
+    c_patch((address)&insn, 12, 12, (offset & nth_bit(11)) >> 11);
+    c_patch((address)&insn, 15, 13, 0b101);
+    emit_int16(insn);
   }
 
-  INSN(c_j, 0b101, 0b01);
+  void c_j(address dest) {
+    assert_cond(dest != nullptr);
+    int64_t distance = dest - pc();
+    assert(is_simm12(distance) && ((distance % 2) == 0), "invalid encoding");
+    c_j(distance);
+  }
 
-#undef INSN
+  void c_j(Label &L) {
+    wrap_label(L, &Assembler::c_j);
+  }
+
+  public:
 
 #define INSN(NAME, funct3, op)                                                               \
   void NAME(Register Rs1, int32_t imm) {                                                     \
@@ -2812,24 +2811,35 @@ enum Nf {
 // --------------------------
 // Unconditional branch instructions
 // --------------------------
-#define INSN(NAME)                                                                           \
-  void NAME(Register Rd, Register Rs, const int32_t offset) {                                \
-    /* jalr -> c.jr/c.jalr */                                                                \
-    if (do_compress() && (offset == 0 && Rs != x0)) {                                        \
-      if (Rd == x1) {                                                                        \
-        c_jalr(Rs);                                                                          \
-        return;                                                                              \
-      } else if (Rd == x0) {                                                                 \
-        c_jr(Rs);                                                                            \
-        return;                                                                              \
-      }                                                                                      \
-    }                                                                                        \
-    _jalr(Rd, Rs, offset);                                                                   \
+ protected:
+  // All calls and jumps must go via MASM.
+  void jalr(Register Rd, Register Rs, const int32_t offset) {
+    /* jalr -> c.jr/c.jalr */
+    if (do_compress() && (offset == 0 && Rs != x0)) {
+      if (Rd == x1) {
+        c_jalr(Rs);
+        return;
+      } else if (Rd == x0) {
+        c_jr(Rs);
+        return;
+      }
+    }
+    _jalr(Rd, Rs, offset);
   }
 
-  INSN(jalr);
+  void jal(Register Rd, const int32_t offset) {
+    /* jal -> c.j, note c.jal is RV32C only */
+    if (do_compress() &&
+        Rd == x0 &&
+        is_simm12(offset) && ((offset % 2) == 0)) {
+      c_j(offset);
+      return;
+    }
 
-#undef INSN
+    _jal(Rd, offset);
+  }
+
+  public:
 
 // --------------------------
 // Miscellaneous Instructions
@@ -3009,18 +3019,6 @@ enum Nf {
 
 #undef INSN
 
-// ---------------------------------------------------------------------------------------
-
-#define INSN(NAME, REGISTER)                       \
-  void NAME(Register Rs) {                         \
-    jalr(REGISTER, Rs, 0);                         \
-  }
-
-  INSN(jr,   x0);
-  INSN(jalr, x1);
-
-#undef INSN
-
 // --------------  ZCB Instruction Definitions  --------------
 // Zcb additional C instructions
  private:
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
index 5d0fa3fad3c..a15405f5323 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
@@ -1841,17 +1841,7 @@ void LIR_Assembler::leal(LIR_Opr addr, LIR_Opr dest, LIR_PatchCode patch_code, C
 void LIR_Assembler::rt_call(LIR_Opr result, address dest, const LIR_OprList* args, LIR_Opr tmp, CodeEmitInfo* info) {
   assert(!tmp->is_valid(), "don't need temporary");
 
-  CodeBlob *cb = CodeCache::find_blob(dest);
-  if (cb != nullptr) {
-    __ far_call(RuntimeAddress(dest));
-  } else {
-    RuntimeAddress target(dest);
-    __ relocate(target.rspec(), [&] {
-      int32_t offset;
-      __ movptr(t0, target.target(), offset);
-      __ jalr(x1, t0, offset);
-    });
-  }
+  __ rt_call(dest);
 
   if (info != nullptr) {
     add_call_info_here(info);
diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
index 26d60441c2d..a93bf5394ce 100644
--- a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
@@ -300,7 +300,7 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier(MacroAssembler* masm,
     assert(!is_narrow, "phantom access cannot be narrow");
     target = CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_weak);
   }
-  __ call(target);
+  __ rt_call(target);
   __ mv(t0, x10);
   __ pop_call_clobbered_registers();
   __ mv(x10, t0);
@@ -703,7 +703,7 @@ void ShenandoahBarrierSetAssembler::generate_c1_load_reference_barrier_runtime_s
     assert(is_native, "phantom must only be called off-heap");
     target = CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_phantom);
   }
-  __ call(target);
+  __ rt_call(target);
   __ mv(t0, x10);
   __ pop_call_clobbered_registers();
   __ mv(x10, t0);
diff --git a/src/hotspot/cpu/riscv/jniFastGetField_riscv.cpp b/src/hotspot/cpu/riscv/jniFastGetField_riscv.cpp
index fd1701c8188..8423ecad8a3 100644
--- a/src/hotspot/cpu/riscv/jniFastGetField_riscv.cpp
+++ b/src/hotspot/cpu/riscv/jniFastGetField_riscv.cpp
@@ -177,7 +177,7 @@ address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
     __ relocate(target.rspec(), [&] {
       int32_t offset;
       __ la(t0, target.target(), offset);
-      __ jalr(x1, t0, offset);
+      __ jalr(t0, offset);
     });
     __ leave();
     __ ret();
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index b450d93680f..bfa68a88f57 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -339,7 +339,7 @@ void MacroAssembler::call_VM_base(Register oop_result,
     relocate(target.rspec(), [&] {
       int32_t offset;
       la(t0, target.target(), offset);
-      jalr(x0, t0, offset);
+      jr(t0, offset);
     });
     bind(ok);
   }
@@ -641,14 +641,16 @@ void MacroAssembler::emit_static_call_stub() {
   // Jump to the entry point of the c2i stub.
   int32_t offset = 0;
   movptr(t0, 0, offset);
-  jalr(x0, t0, offset);
+  jr(t0, offset);
 }
 
 void MacroAssembler::call_VM_leaf_base(address entry_point,
                                        int number_of_arguments,
                                        Label *retaddr) {
+  int32_t offset = 0;
   push_reg(RegSet::of(t0, xmethod), sp);   // push << t0 & xmethod >> to sp
-  call(entry_point);
+  mv(t0, entry_point, offset);
+  jalr(t0, offset);
   if (retaddr != nullptr) {
     bind(*retaddr);
   }
@@ -716,33 +718,19 @@ void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0, Reg
 }
 
 void MacroAssembler::la(Register Rd, const address addr) {
-  int64_t offset = addr - pc();
-  if (is_valid_32bit_offset(offset)) {
-    auipc(Rd, (int32_t)offset + 0x800);  //0x800, Note:the 11th sign bit
-    addi(Rd, Rd, ((int64_t)offset << 52) >> 52);
-  } else {
-    movptr(Rd, addr);
-  }
+  int32_t offset;
+  la(Rd, addr, offset);
+  addi(Rd, Rd, offset);
 }
 
 void MacroAssembler::la(Register Rd, const address addr, int32_t &offset) {
-  assert((uintptr_t)addr < (1ull << 48), "bad address");
-
-  unsigned long target_address = (uintptr_t)addr;
-  unsigned long low_address = (uintptr_t)CodeCache::low_bound();
-  unsigned long high_address = (uintptr_t)CodeCache::high_bound();
-  long offset_low = target_address - low_address;
-  long offset_high = target_address - high_address;
-
-  // RISC-V doesn't compute a page-aligned address, in order to partially
-  // compensate for the use of *signed* offsets in its base+disp12
-  // addressing mode (RISC-V's PC-relative reach remains asymmetric
-  // [-(2G + 2K), 2G - 2K).
-  if (offset_high >= -((1L << 31) + (1L << 11)) && offset_low < (1L << 31) - (1L << 11)) {
+  if (is_32bit_offset_from_codecache((int64_t)addr)) {
     int64_t distance = addr - pc();
+    assert(is_valid_32bit_offset(distance), "Must be");
     auipc(Rd, (int32_t)distance + 0x800);
     offset = ((int32_t)distance << 20) >> 20;
   } else {
+    assert(!CodeCache::contains(addr), "Must be");
     movptr(Rd, addr, offset);
   }
 }
@@ -859,88 +847,113 @@ void MacroAssembler::li(Register Rd, int64_t imm) {
   }
 }
 
-#define INSN(NAME, REGISTER)                                       \
-  void MacroAssembler::NAME(const address dest, Register temp) {   \
-    assert_cond(dest != nullptr);                                  \
-    int64_t distance = dest - pc();                                \
-    if (is_simm21(distance) && ((distance % 2) == 0)) {            \
-      Assembler::jal(REGISTER, distance);                          \
-    } else {                                                       \
-      assert(temp != noreg, "expecting a register");               \
-      int32_t offset = 0;                                          \
-      movptr(temp, dest, offset);                                  \
-      Assembler::jalr(REGISTER, temp, offset);                     \
-    }                                                              \
-  }                                                                \
-
-  INSN(j,   x0);
-  INSN(jal, x1);
-
-#undef INSN
+void MacroAssembler::jump_link(const address dest, Register temp) {
+  assert_cond(dest != nullptr);
+  int64_t distance = dest - pc();
+  if (is_simm21(distance) && ((distance % 2) == 0)) {
+    Assembler::jal(x1, distance);
+  } else {
+    assert(temp != noreg && temp != x0, "expecting a register");
+    int32_t offset = 0;
+    la(temp, dest, offset);
+    jalr(temp, offset);
+  }
+}
 
-#define INSN(NAME, REGISTER)                                       \
-  void MacroAssembler::NAME(const Address &adr, Register temp) {   \
-    switch (adr.getMode()) {                                       \
-      case Address::literal: {                                     \
-        relocate(adr.rspec(), [&] {                                \
-          NAME(adr.target(), temp);                                \
-        });                                                        \
-        break;                                                     \
-      }                                                            \
-      case Address::base_plus_offset: {                            \
-        int32_t offset = ((int32_t)adr.offset() << 20) >> 20;      \
-        la(temp, Address(adr.base(), adr.offset() - offset));      \
-        Assembler::jalr(REGISTER, temp, offset);                   \
-        break;                                                     \
-      }                                                            \
-      default:                                                     \
-        ShouldNotReachHere();                                      \
-    }                                                              \
-  }
-
-  INSN(j,   x0);
-  INSN(jal, x1);
+void MacroAssembler::jump_link(const Address &adr, Register temp) {
+  switch (adr.getMode()) {
+    case Address::literal: {
+      relocate(adr.rspec(), [&] {
+        jump_link(adr.target(), temp);
+      });
+      break;
+    }
+    case Address::base_plus_offset: {
+      int32_t offset = ((int32_t)adr.offset() << 20) >> 20;
+      la(temp, Address(adr.base(), adr.offset() - offset));
+      jalr(temp, offset);
+      break;
+    }
+    default:
+      ShouldNotReachHere();
+  }
+}
 
-#undef INSN
+void MacroAssembler::j(const address dest, Register temp) {
+  assert(CodeCache::contains(dest), "Must be");
+  assert_cond(dest != nullptr);
+  int64_t distance = dest - pc();
 
-#define INSN(NAME)                                                                    \
-  void MacroAssembler::NAME(Register Rd, const address dest, Register temp) {         \
-    assert_cond(dest != nullptr);                                                     \
-    int64_t distance = dest - pc();                                                   \
-    if (is_simm21(distance) && ((distance % 2) == 0)) {                               \
-      Assembler::NAME(Rd, distance);                                                  \
-    } else {                                                                          \
-      assert_different_registers(Rd, temp);                                           \
-      int32_t offset = 0;                                                             \
-      movptr(temp, dest, offset);                                                     \
-      jalr(Rd, temp, offset);                                                         \
-    }                                                                                 \
-  }                                                                                   \
-  void MacroAssembler::NAME(Register Rd, Label &L, Register temp) {                   \
-    assert_different_registers(Rd, temp);                                             \
-    wrap_label(Rd, L, temp, &MacroAssembler::NAME);                                   \
+  // We can't patch C, i.e. if Label wasn't bound we need to patch this jump.
+  IncompressibleRegion ir(this);
+  if (is_simm21(distance) && ((distance % 2) == 0)) {
+    Assembler::jal(x0, distance);
+  } else {
+    assert(temp != noreg && temp != x0, "expecting a register");
+    int32_t offset = 0;
+    la(temp, dest, offset);
+    jr(temp, offset);
   }
+}
 
-  INSN(jal);
+void MacroAssembler::j(const Address &adr, Register temp) {
+  switch (adr.getMode()) {
+    case Address::literal: {
+      relocate(adr.rspec(), [&] {
+        j(adr.target(), temp);
+      });
+      break;
+    }
+    case Address::base_plus_offset: {
+      int32_t offset = ((int32_t)adr.offset() << 20) >> 20;
+      la(temp, Address(adr.base(), adr.offset() - offset));
+      jr(temp, offset);
+      break;
+    }
+    default:
+      ShouldNotReachHere();
+  }
+}
 
-#undef INSN
+void MacroAssembler::j(Label &lab, Register temp) {
+  assert_different_registers(x0, temp);
+  if (lab.is_bound()) {
+    MacroAssembler::j(target(lab), temp);
+  } else {
+    lab.add_patch_at(code(), locator());
+    MacroAssembler::j(pc(), temp);
+  }
+}
 
-#define INSN(NAME, REGISTER)                                       \
-  void MacroAssembler::NAME(Label &l, Register temp) {             \
-    jal(REGISTER, l, temp);                                        \
-  }                                                                \
+void MacroAssembler::jr(Register Rd, int32_t offset) {
+  assert(Rd != noreg, "expecting a register");
+  Assembler::jalr(x0, Rd, offset);
+}
 
-  INSN(j,   x0);
-  INSN(jal, x1);
+void MacroAssembler::call(const address dest, Register temp) {
+  assert_cond(dest != nullptr);
+  assert(temp != noreg, "expecting a register");
+  int32_t offset = 0;
+  la(temp, dest, offset);
+  jalr(temp, offset);
+}
 
-#undef INSN
+void MacroAssembler::jalr(Register Rs, int32_t offset) {
+  assert(Rs != noreg, "expecting a register");
+  Assembler::jalr(x1, Rs, offset);
+}
 
-void MacroAssembler::wrap_label(Register Rt, Label &L, Register tmp, load_insn_by_temp insn) {
-  if (L.is_bound()) {
-    (this->*insn)(Rt, target(L), tmp);
+void MacroAssembler::rt_call(address dest, Register tmp) {
+  CodeBlob *cb = CodeCache::find_blob(dest);
+  RuntimeAddress target(dest);
+  if (cb) {
+    far_call(target, tmp);
   } else {
-    L.add_patch_at(code(), locator());
-    (this->*insn)(Rt, pc(), tmp);
+    relocate(target.rspec(), [&] {
+      int32_t offset;
+      la(tmp, target.target(), offset);
+      jalr(tmp, offset);
+    });
   }
 }
 
@@ -3169,7 +3182,6 @@ void MacroAssembler::atomic_cas(
 }
 
 void MacroAssembler::far_jump(const Address &entry, Register tmp) {
-  assert(ReservedCodeCacheSize < 4*G, "branch out of range");
   assert(CodeCache::find_blob(entry.target()) != nullptr,
          "destination of far call not found in code cache");
   assert(entry.rspec().type() == relocInfo::external_word_type
@@ -3179,12 +3191,11 @@ void MacroAssembler::far_jump(const Address &entry, Register tmp) {
   relocate(entry.rspec(), [&] {
     int32_t offset;
     la(tmp, entry.target(), offset);
-    jalr(x0, tmp, offset);
+    jr(tmp, offset);
   });
 }
 
 void MacroAssembler::far_call(const Address &entry, Register tmp) {
-  assert(ReservedCodeCacheSize < 4*G, "branch out of range");
   assert(CodeCache::find_blob(entry.target()) != nullptr,
          "destination of far call not found in code cache");
   assert(entry.rspec().type() == relocInfo::external_word_type
@@ -3194,9 +3205,8 @@ void MacroAssembler::far_call(const Address &entry, Register tmp) {
   // We can use auipc + jalr here because we know that the total size of
   // the code cache cannot exceed 2Gb.
   relocate(entry.rspec(), [&] {
-    int32_t offset;
-    la(tmp, entry.target(), offset);
-    jalr(x1, tmp, offset); // link
+    assert(is_valid_32bit_offset(entry.target() - pc()), "Far call using wrong instructions.");
+    call(entry.target(), tmp);
   });
 }
 
@@ -3452,7 +3462,7 @@ void MacroAssembler::reserved_stack_check() {
     relocate(target.rspec(), [&] {
       int32_t offset;
       movptr(t0, target.target(), offset);
-      jalr(x0, t0, offset);
+      jr(t0, offset);
     });
     should_not_reach_here();
 
@@ -3534,7 +3544,7 @@ address MacroAssembler::trampoline_call(Address entry) {
   }
 #endif
   relocate(entry.rspec(), [&] {
-    jal(target);
+    jump_link(target, t0);
   });
 
   postcond(pc() != badAddress);
@@ -4373,7 +4383,7 @@ address MacroAssembler::zero_words(Register ptr, Register cnt) {
         return nullptr;
       }
     } else {
-      jal(zero_blocks);
+      jump_link(zero_blocks, t0);
     }
   }
   bind(around);
@@ -5018,20 +5028,6 @@ void MacroAssembler::double_move(VMRegPair src, VMRegPair dst, Register tmp) {
   }
 }
 
-void MacroAssembler::rt_call(address dest, Register tmp) {
-  CodeBlob *cb = CodeCache::find_blob(dest);
-  RuntimeAddress target(dest);
-  if (cb) {
-    far_call(target, tmp);
-  } else {
-    relocate(target.rspec(), [&] {
-      int32_t offset;
-      movptr(tmp, target.target(), offset);
-      jalr(x1, tmp, offset);
-    });
-  }
-}
-
 void MacroAssembler::test_bit(Register Rd, Register Rs, uint32_t bit_pos) {
   assert(bit_pos < 64, "invalid bit range");
   if (UseZbs) {
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index 7c77edd8711..35a242e47fd 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -592,14 +592,40 @@ class MacroAssembler: public Assembler {
   void bltz(Register Rs, const address dest);
   void bgtz(Register Rs, const address dest);
 
-  void j(Label &l, Register temp = t0);
+ private:
+  void jump_link(const address dest, Register temp);
+  void jump_link(const Address &adr, Register temp);
+ public:
+  // 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
+
+  // jump: jal x0, offset
+  // For long reach uses temp register for:
+  // la + jr
   void j(const address dest, Register temp = t0);
   void j(const Address &adr, Register temp = t0);
-  void jal(Label &l, Register temp = t0);
-  void jal(const address dest, Register temp = t0);
-  void jal(const Address &adr, Register temp = t0);
-  void jal(Register Rd, Label &L, Register temp = t0);
-  void jal(Register Rd, const address dest, Register temp = t0);
+  void j(Label &l, Register temp = t0);
+
+  // jump register: jalr x0, offset(rs)
+  void jr(Register Rd, int32_t offset = 0);
+
+  // call: la + jalr x1
+  void call(const address dest, Register temp = t0);
+
+  // jalr: jalr x1, offset(rs)
+  void jalr(Register Rs, int32_t offset = 0);
+
+  // Emit a runtime call. Only invalidates the tmp register which
+  // is used to keep the entry address for jalr/movptr.
+  // Uses call() for intra code cache, else movptr + jalr.
+  void rt_call(address dest, Register tmp = t0);
+
+  // ret: jalr x0, 0(x1)
+  inline void ret() {
+    Assembler::jalr(x0, x1, 0);
+  }
 
   //label
   void beqz(Register Rs, Label &l, bool is_far = false);
@@ -689,6 +715,14 @@ class MacroAssembler: public Assembler {
     return x < (twoG - twoK) && x >= (-twoG - twoK);
   }
 
+  // Ensure that the auipc can reach the destination at x from anywhere within
+  // the code cache so that if it is relocated we know it will still reach.
+  bool is_32bit_offset_from_codecache(int64_t x) {
+    int64_t low  = (int64_t)CodeCache::low_bound();
+    int64_t high = (int64_t)CodeCache::high_bound();
+    return is_valid_32bit_offset(x - low) && is_valid_32bit_offset(x - high);
+  }
+
 public:
   void push_reg(Register Rs);
   void pop_reg(Register Rd);
@@ -733,14 +767,13 @@ class MacroAssembler: public Assembler {
   typedef void (MacroAssembler::* compare_and_branch_insn)(Register Rs1, Register Rs2, const address dest);
   typedef void (MacroAssembler::* compare_and_branch_label_insn)(Register Rs1, Register Rs2, Label &L, bool is_far);
   typedef void (MacroAssembler::* jal_jalr_insn)(Register Rt, address dest);
-  typedef void (MacroAssembler::* load_insn_by_temp)(Register Rt, address dest, Register temp);
 
-  void wrap_label(Register r, Label &L, Register t, load_insn_by_temp insn);
   void wrap_label(Register r, Label &L, jal_jalr_insn insn);
   void wrap_label(Register r1, Register r2, Label &L,
                   compare_and_branch_insn insn,
                   compare_and_branch_label_insn neg_insn, bool is_far = false);
 
+  // la will use movptr instead of GOT when not in reach for auipc.
   void la(Register Rd, Label &label);
   void la(Register Rd, const address addr);
   void la(Register Rd, const address addr, int32_t &offset);
@@ -1469,21 +1502,6 @@ class MacroAssembler: public Assembler {
                    VMRegPair dst,
                    bool is_receiver,
                    int* receiver_offset);
-  // Emit a runtime call. Only invalidates the tmp register which
-  // is used to keep the entry address for jalr/movptr.
-  void rt_call(address dest, Register tmp = t0);
-
-  void call(const address dest, Register temp = t0) {
-    assert_cond(dest != nullptr);
-    assert(temp != noreg, "expecting a register");
-    int32_t offset = 0;
-    mv(temp, dest, offset);
-    jalr(x1, temp, offset);
-  }
-
-  inline void ret() {
-    jalr(x0, x1, 0);
-  }
 
 #ifdef ASSERT
   // Template short-hand support to clean-up after a failed call to trampoline
diff --git a/src/hotspot/cpu/riscv/matcher_riscv.hpp b/src/hotspot/cpu/riscv/matcher_riscv.hpp
index 32665f5922c..2fa6e8c80ca 100644
--- a/src/hotspot/cpu/riscv/matcher_riscv.hpp
+++ b/src/hotspot/cpu/riscv/matcher_riscv.hpp
@@ -128,8 +128,8 @@
   static const bool int_in_long = true;
 
   // Does the CPU supports vector variable shift instructions?
-  static constexpr bool supports_vector_variable_shifts(void) {
-    return false;
+  static bool supports_vector_variable_shifts(void) {
+    return UseRVV;
   }
 
   // Does target support predicated operation emulation.
diff --git a/src/hotspot/cpu/riscv/nativeInst_riscv.cpp b/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
index c4048f66e0d..399de3a2805 100644
--- a/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
+++ b/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
@@ -400,7 +400,7 @@ void NativeGeneralJump::insert_unconditional(address code_pos, address entry) {
 
   int32_t offset = 0;
   a.movptr(t0, entry, offset); // lui, addi, slli, addi, slli
-  a.jalr(x0, t0, offset); // jalr
+  a.jr(t0, offset); // jalr
 
   ICache::invalidate_range(code_pos, instruction_size);
 }
@@ -410,7 +410,6 @@ void NativeGeneralJump::replace_mt_safe(address instr_addr, address code_buffer)
   ShouldNotCallThis();
 }
 
-
 address NativeCallTrampolineStub::destination(nmethod *nm) const {
   return ptr_at(data_offset);
 }
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 826049f4b8a..a0d1b1921cd 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -2150,11 +2150,44 @@ bool size_fits_all_mem_uses(AddPNode* addp, int shift) {
   return true;
 }
 
+// Binary src (Replicate scalar/immediate)
+static bool is_vector_scalar_bitwise_pattern(Node* n, Node* m) {
+  if (n == nullptr || m == nullptr) {
+    return false;
+  }
+
+  if (m->Opcode() != Op_Replicate) {
+    return false;
+  }
+
+  switch (n->Opcode()) {
+    case Op_AndV:
+    case Op_OrV:
+    case Op_XorV: {
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+
+// (XorV src (Replicate m1))
+// (XorVMask src (MaskAll m1))
+static bool is_vector_bitwise_not_pattern(Node* n, Node* m) {
+  if (n != nullptr && m != nullptr) {
+    return (n->Opcode() == Op_XorV || n->Opcode() == Op_XorVMask) &&
+           VectorNode::is_all_ones_vector(m);
+  }
+  return false;
+}
+
 // Should the Matcher clone input 'm' of node 'n'?
 bool Matcher::pd_clone_node(Node* n, Node* m, Matcher::MStack& mstack) {
   assert_cond(m != nullptr);
-  if (is_vshift_con_pattern(n, m)) { // ShiftV src (ShiftCntV con)
-    mstack.push(m, Visit);           // m = ShiftCntV
+  if (is_vshift_con_pattern(n, m) || // ShiftV src (ShiftCntV con)
+      is_vector_bitwise_not_pattern(n, m) ||
+      is_vector_scalar_bitwise_pattern(n, m)) {
+    mstack.push(m, Visit);
     return true;
   }
   return false;
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 3d2cbbe5cf4..5c57ffabe56 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -483,6 +483,130 @@ instruct vand_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
+// vector-immediate and (unpredicated)
+
+instruct vand_immI(vReg dst_src, immI5 con) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (AndV dst_src (Replicate con)));
+  format %{ "vand_immI $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vand_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               $con$$constant);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_immL(vReg dst_src, immL5 con) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (AndV dst_src (Replicate con)));
+  format %{ "vand_immL $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vand_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               $con$$constant);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-scalar and (unpredicated)
+
+instruct vand_regI(vReg dst_src, iRegIorL2I src) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (AndV dst_src (Replicate src)));
+  format %{ "vand_regI $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vand_vx(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               as_Register($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_regL(vReg dst_src, iRegL src) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (AndV dst_src (Replicate src)));
+  format %{ "vand_regL $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vand_vx(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               as_Register($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-immediate and (predicated)
+
+instruct vand_immI_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (AndV (Binary dst_src (Replicate con)) v0));
+  format %{ "vand_immI_masked $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vand_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               $con$$constant, Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_immL_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (AndV (Binary dst_src (Replicate con)) v0));
+  format %{ "vand_immL_masked $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vand_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               $con$$constant, Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-scalar and (predicated)
+
+instruct vand_regI_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (AndV (Binary dst_src (Replicate src)) v0));
+  format %{ "vand_regI_masked $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vand_vx(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               as_Register($src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_regL_masked(vReg dst_src, iRegL src, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (AndV (Binary dst_src (Replicate src)) v0));
+  format %{ "vand_regL_masked $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vand_vx(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               as_Register($src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // vector or
 
 instruct vor(vReg dst, vReg src1, vReg src2) %{
@@ -515,6 +639,130 @@ instruct vor_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
+// vector-immediate or (unpredicated)
+
+instruct vor_immI(vReg dst_src, immI5 con) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (OrV dst_src (Replicate con)));
+  format %{ "vor_immI $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vor_vi(as_VectorRegister($dst_src$$reg),
+              as_VectorRegister($dst_src$$reg),
+              $con$$constant);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vor_immL(vReg dst_src, immL5 con) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (OrV dst_src (Replicate con)));
+  format %{ "vor_immL $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vor_vi(as_VectorRegister($dst_src$$reg),
+              as_VectorRegister($dst_src$$reg),
+              $con$$constant);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-scalar or (unpredicated)
+
+instruct vor_regI(vReg dst_src, iRegIorL2I src) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (OrV dst_src (Replicate src)));
+  format %{ "vor_regI $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vor_vx(as_VectorRegister($dst_src$$reg),
+              as_VectorRegister($dst_src$$reg),
+              as_Register($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vor_regL(vReg dst_src, iRegL src) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (OrV dst_src (Replicate src)));
+  format %{ "vor_regL $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vor_vx(as_VectorRegister($dst_src$$reg),
+              as_VectorRegister($dst_src$$reg),
+              as_Register($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-immediate or (predicated)
+
+instruct vor_immI_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (OrV (Binary dst_src (Replicate con)) v0));
+  format %{ "vor_immI_masked $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vor_vi(as_VectorRegister($dst_src$$reg),
+              as_VectorRegister($dst_src$$reg),
+              $con$$constant, Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vor_immL_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (OrV (Binary dst_src (Replicate con)) v0));
+  format %{ "vor_immL_masked $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vor_vi(as_VectorRegister($dst_src$$reg),
+              as_VectorRegister($dst_src$$reg),
+              $con$$constant, Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-scalar or (predicated)
+
+instruct vor_regI_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (OrV (Binary dst_src (Replicate src)) v0));
+  format %{ "vor_regI_masked $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vor_vx(as_VectorRegister($dst_src$$reg),
+              as_VectorRegister($dst_src$$reg),
+              as_Register($src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vor_regL_masked(vReg dst_src, iRegL src, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (OrV (Binary dst_src (Replicate src)) v0));
+  format %{ "vor_regL_masked $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vor_vx(as_VectorRegister($dst_src$$reg),
+              as_VectorRegister($dst_src$$reg),
+              as_Register($src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // vector xor
 
 instruct vxor(vReg dst, vReg src1, vReg src2) %{
@@ -547,6 +795,194 @@ instruct vxor_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
+// vector-immediate xor (unpredicated)
+
+instruct vxor_immI(vReg dst_src, immI5 con) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (XorV dst_src (Replicate con)));
+  format %{ "vxor_immI $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vxor_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               $con$$constant);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vxor_immL(vReg dst_src, immL5 con) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (XorV dst_src (Replicate con)));
+  format %{ "vxor_immL $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vxor_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               $con$$constant);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-scalar xor (unpredicated)
+
+instruct vxor_regI(vReg dst_src, iRegIorL2I src) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (XorV dst_src (Replicate src)));
+  format %{ "vxor_regI $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vxor_vx(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               as_Register($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vxor_regL(vReg dst_src, iRegL src) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (XorV dst_src (Replicate src)));
+  format %{ "vxor_regL $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vxor_vx(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               as_Register($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-immediate xor (predicated)
+
+instruct vxor_immI_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (XorV (Binary dst_src (Replicate con)) v0));
+  format %{ "vxor_immI_masked $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vxor_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               $con$$constant, Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vxor_immL_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (XorV (Binary dst_src (Replicate con)) v0));
+  format %{ "vxor_immL_masked $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vxor_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               $con$$constant, Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-scalar xor (predicated)
+
+instruct vxor_regI_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (XorV (Binary dst_src (Replicate src)) v0));
+  format %{ "vxor_regI_masked $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vxor_vx(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               as_Register($src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vxor_regL_masked(vReg dst_src, iRegL src, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (XorV (Binary dst_src (Replicate src)) v0));
+  format %{ "vxor_regL_masked $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vxor_vx(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               as_Register($src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// ------------------------------ Vector not -----------------------------------
+
+// vector not
+
+instruct vnotI(vReg dst, vReg src, immI_M1 m1) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst (XorV src (Replicate m1)));
+  format %{ "vnotI $dst, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vxor_vi(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src$$reg),
+               -1);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vnotL(vReg dst, vReg src, immL_M1 m1) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst (XorV src (Replicate m1)));
+  format %{ "vnotL $dst, $src" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vxor_vi(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src$$reg),
+               -1);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector not - predicated
+
+instruct vnotI_masked(vReg dst_src, immI_M1 m1, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (XorV (Binary dst_src (Replicate m1)) v0));
+  format %{ "vnotI_masked $dst_src, $dst_src, $v0" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vxor_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               -1, Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vnotL_masked(vReg dst_src, immI_M1 m1, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (XorV (Binary dst_src (Replicate m1)) v0));
+  format %{ "vnotL_masked $dst_src, $dst_src, $v0" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vxor_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               -1, Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // vector float div
 
 instruct vdiv_fp(vReg dst, vReg src1, vReg src2) %{
@@ -1782,6 +2218,32 @@ instruct replicateD(vReg dst, fRegD src) %{
 %}
 
 // vector shift
+//
+// Following shift instruct's are shared by vectorization (in SLP, superword.cpp) and Vector API.
+//
+// Shift behaviour in vectorization is defined by java language spec, which includes:
+//  1. "If the promoted type of the left-hand operand is int, then only the five lowest-order bits of
+//      the right-hand operand are used as the shift distance. It is as if the right-hand operand were
+//      subjected to a bitwise logical AND operator & (§15.22.1) with the mask value 0x1f (0b11111).
+//      The shift distance actually used is therefore always in the range 0 to 31, inclusive."
+//  2. similarly, for long "with the mask value 0x3f (0b111111)"
+// check https://docs.oracle.com/javase/specs/jls/se21/html/jls-15.html#jls-15.19 for details.
+//
+// Shift behaviour in Vector API is defined as:
+//   e.g. for ASHR, "a>>(n&(ESIZE*8-1))"
+//   this behaviour is the same as shift instrunction's in riscv vector extension.
+// check https://docs.oracle.com/en/java/javase/21/docs/api/jdk.incubator.vector/jdk/incubator/vector/VectorOperators.html#ASHR
+// and https://github.com/riscv/riscv-v-spec/blob/master/v-spec.adoc#116-vector-single-width-shift-instructions for details.
+//
+// Despite the difference between these 2 behaviours, the same shift instruct's of byte and short are
+// still shared between vectorization and Vector API. The way it works is hidden inside the implementation
+// of vectorization and Vector API:
+//  1. when doing optimization vectorization masks the shift value with "(BitsPerInt - 1)" or "(BitsPerLong - 1)"
+//  2. in Vector API, shift value is masked with SHIFT_MASK (e.g. for ByteVector it's "Byte.SIZE - 1")
+//
+// If not because of this pre-processing of shift value respectively in vectorization and Vector API, then
+// e.g. for a byte shift value 16, the intrinsic behaviour will be different, and they can not share the same
+// instruct here, as vectorization requires x >> 16, but Vector API requires x >> (16 & 7).
 
 instruct vasrB(vReg dst, vReg src, vReg shift, vRegMask_V0 v0) %{
   match(Set dst (RShiftVB src shift));
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index 582538a18b4..52fc126a459 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -652,7 +652,7 @@ class StubGenerator: public StubCodeGenerator {
     assert(frame::arg_reg_save_area_bytes == 0, "not expecting frame reg save area");
 #endif
     BLOCK_COMMENT("call MacroAssembler::debug");
-    __ call(CAST_FROM_FN_PTR(address, MacroAssembler::debug64));
+    __ rt_call(CAST_FROM_FN_PTR(address, MacroAssembler::debug64));
     __ ebreak();
 
     return start;
@@ -5450,7 +5450,7 @@ static const int64_t right_3_bits = right_n_bits(3);
     }
     __ mv(c_rarg0, xthread);
     BLOCK_COMMENT("call runtime_entry");
-    __ call(runtime_entry);
+    __ rt_call(runtime_entry);
 
     // Generate oop map
     OopMap* map = new OopMap(framesize, 0);
diff --git a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
index 07aad47173c..769e4dc5ccc 100644
--- a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
@@ -1206,7 +1206,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     // hand.
     //
     __ mv(c_rarg0, xthread);
-    __ call(CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans));
+    __ rt_call(CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans));
     __ get_method(xmethod);
     __ reinit_heapbase();
     __ bind(Continue);
@@ -1255,7 +1255,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
 
     __ push_call_clobbered_registers();
     __ mv(c_rarg0, xthread);
-    __ call(CAST_FROM_FN_PTR(address, SharedRuntime::reguard_yellow_pages));
+    __ rt_call(CAST_FROM_FN_PTR(address, SharedRuntime::reguard_yellow_pages));
     __ pop_call_clobbered_registers();
     __ bind(no_reguard);
   }
@@ -1815,7 +1815,7 @@ void TemplateInterpreterGenerator::trace_bytecode(Template* t) {
   // the tosca in-state for the given template.
 
   assert(Interpreter::trace_code(t->tos_in()) != nullptr, "entry must have been generated");
-  __ jal(Interpreter::trace_code(t->tos_in()));
+  __ call(Interpreter::trace_code(t->tos_in()));
   __ reinit_heapbase();
 }
 
diff --git a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
index 503440a5fcc..a5e62169a93 100644
--- a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
@@ -2274,7 +2274,9 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
   address entry = StubRoutines::select_arraycopy_function(basic_type, aligned, disjoint, name, false);
   __ call_VM_leaf(entry);
 
-  __ bind(*stub->continuation());
+  if (stub != nullptr) {
+    __ bind(*stub->continuation());
+  }
 }
 
 void LIR_Assembler::shift_op(LIR_Code code, LIR_Opr left, LIR_Opr count, LIR_Opr dest, LIR_Opr tmp) {
@@ -2385,7 +2387,8 @@ void LIR_Assembler::emit_alloc_array(LIR_OpAllocArray* op) {
                       arrayOopDesc::base_offset_in_bytes(op->type()),
                       type2aelembytes(op->type()),
                       op->klass()->as_register(),
-                      *op->stub()->entry());
+                      *op->stub()->entry(),
+                      op->zero_array());
   }
   __ bind(*op->stub()->continuation());
 }
diff --git a/src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp b/src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp
index 8df13597425..619f0f7174f 100644
--- a/src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016, 2017 SAP SE. All rights reserved.
+ * Copyright (c) 2016, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -710,7 +710,13 @@ void LIRGenerator::do_ArrayCopy(Intrinsic* x) {
   frame_map()->c_calling_convention(&sig);
 
   // Make all state_for calls early since they can emit code.
-  CodeEmitInfo* info = state_for (x, x->state());
+  CodeEmitInfo* info = nullptr;
+  if (x->state_before() != nullptr && x->state_before()->force_reexecute()) {
+    info = state_for(x, x->state_before());
+    info->set_force_reexecute();
+  } else {
+    info = state_for(x, x->state());
+  }
 
   LIRItem src(x->argument_at(0), this);
   LIRItem src_pos(x->argument_at(1), this);
@@ -735,6 +741,9 @@ void LIRGenerator::do_ArrayCopy(Intrinsic* x) {
   int flags;
   ciArrayKlass* expected_type;
   arraycopy_helper(x, &flags, &expected_type);
+  if (x->check_flag(Instruction::OmitChecksFlag)) {
+    flags = 0;
+  }
 
   __ arraycopy(src.result(), src_pos.result(), dst.result(), dst_pos.result(),
                length.result(), tmp, expected_type, flags, info); // does add_safepoint
@@ -769,7 +778,13 @@ void LIRGenerator::do_NewInstance(NewInstance* x) {
 }
 
 void LIRGenerator::do_NewTypeArray(NewTypeArray* x) {
-  CodeEmitInfo* info = state_for (x, x->state());
+  CodeEmitInfo* info = nullptr;
+  if (x->state_before() != nullptr && x->state_before()->force_reexecute()) {
+    info = state_for(x, x->state_before());
+    info->set_force_reexecute();
+  } else {
+    info = state_for(x, x->state());
+  }
 
   LIRItem length(x->length(), this);
   length.load_item();
@@ -786,7 +801,8 @@ void LIRGenerator::do_NewTypeArray(NewTypeArray* x) {
   __ metadata2reg(ciTypeArrayKlass::make(elem_type)->constant_encoding(), klass_reg);
 
   CodeStub* slow_path = new NewTypeArrayStub(klass_reg, len, reg, info);
-  __ allocate_array(reg, len, tmp1, tmp2, tmp3, tmp4, elem_type, klass_reg, slow_path);
+  __ allocate_array(reg, len, tmp1, tmp2, tmp3, tmp4, elem_type,
+                    klass_reg, slow_path, x->zero_array());
 
   LIR_Opr result = rlock_result(x);
   __ move(reg, result);
diff --git a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
index 58bdcee5d5f..604a8336ff9 100644
--- a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016, 2023 SAP SE. All rights reserved.
+ * Copyright (c) 2016, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -191,7 +191,6 @@ void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register
 }
 
 void C1_MacroAssembler::initialize_body(Register objectFields, Register len_in_bytes, Register Rzero) {
-  Label done;
   assert_different_registers(objectFields, len_in_bytes, Rzero);
 
   // Initialize object fields.
@@ -203,7 +202,6 @@ void C1_MacroAssembler::initialize_body(Register objectFields, Register len_in_b
   // Use Rzero as src length, then mvcle will copy nothing
   // and fill the object with the padding value 0.
   move_long_ext(objectFields, as_Register(Rzero->encoding()-1), 0);
-  bind(done);
 }
 
 void C1_MacroAssembler::allocate_object(
@@ -274,7 +272,8 @@ void C1_MacroAssembler::allocate_array(
   int      base_offset_in_bytes,       // elements offset in bytes
   int      elt_size,                   // element size in bytes
   Register klass,                      // object klass
-  Label&   slow_case                   // Continuation point if fast allocation fails.
+  Label&   slow_case,                  // Continuation point if fast allocation fails.
+  bool     zero_array                  // zero the allocated array or not
 ) {
   assert_different_registers(obj, len, t1, t2, klass);
 
@@ -305,15 +304,17 @@ void C1_MacroAssembler::allocate_array(
   initialize_header(obj, klass, len, noreg, t1);
 
   // Clear rest of allocated space.
-  Label done;
-  Register object_fields = t1;
-  Register Rzero = Z_R1_scratch;
-  z_aghi(arr_size, -base_offset_in_bytes);
-  z_bre(done); // Jump if size of fields is zero.
-  z_la(object_fields, base_offset_in_bytes, obj);
-  z_xgr(Rzero, Rzero);
-  initialize_body(object_fields, arr_size, Rzero);
-  bind(done);
+  if (zero_array) {
+    Label done;
+    Register object_fields = t1;
+    Register Rzero = Z_R1_scratch;
+    z_aghi(arr_size, -base_offset_in_bytes);
+    z_bre(done); // Jump if size of fields is zero.
+    z_la(object_fields, base_offset_in_bytes, obj);
+    z_xgr(Rzero, Rzero);
+    initialize_body(object_fields, arr_size, Rzero);
+    bind(done);
+  }
 
   // Dtrace support is unimplemented.
   // if (CURRENT_ENV->dtrace_alloc_probes()) {
diff --git a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp
index c77258509e1..e93eff43bd4 100644
--- a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016, 2023 SAP SE. All rights reserved.
+ * Copyright (c) 2016, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -89,7 +89,8 @@
     int      base_offset_in_bytes,     // elements offset in bytes
     int      elt_size,                 // element size in bytes
     Register klass,                    // object klass
-    Label&   slow_case                 // Continuation point if fast allocation fails.
+    Label&   slow_case,                // Continuation point if fast allocation fails.
+    bool     zero_array                // zero the allocated array or not
   );
 
   // Invalidates registers in this window.
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
index e045572a5cd..c69c8c0d447 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
@@ -1549,6 +1549,8 @@ class MacroAssembler: public Assembler {
       Assembler::evpsrlvd(dst, mask, nds, src, merge, vector_len);
     }
   }
+
+  using Assembler::evpsrlq;
   void evpsrlq(XMMRegister dst, KRegister mask, XMMRegister nds, XMMRegister src, bool merge, int vector_len, bool is_varshift) {
     if (!is_varshift) {
       Assembler::evpsrlq(dst, mask, nds, src, merge, vector_len);
@@ -1570,6 +1572,7 @@ class MacroAssembler: public Assembler {
       Assembler::evpsravd(dst, mask, nds, src, merge, vector_len);
     }
   }
+  using Assembler::evpsraq;
   void evpsraq(XMMRegister dst, KRegister mask, XMMRegister nds, XMMRegister src, bool merge, int vector_len, bool is_varshift) {
     if (!is_varshift) {
       Assembler::evpsraq(dst, mask, nds, src, merge, vector_len);
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index 63226a560f4..3f2865e7465 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -4255,6 +4255,11 @@ void StubGenerator::generate_compiler_stubs() {
     StubRoutines::_poly1305_processBlocks = generate_poly1305_processBlocks();
   }
 
+  if (UseIntPolyIntrinsics) {
+    StubRoutines::_intpoly_montgomeryMult_P256 = generate_intpoly_montgomeryMult_P256();
+    StubRoutines::_intpoly_assign = generate_intpoly_assign();
+  }
+
   if (UseMD5Intrinsics) {
     StubRoutines::_md5_implCompress = generate_md5_implCompress(false, "md5_implCompress");
     StubRoutines::_md5_implCompressMB = generate_md5_implCompress(true, "md5_implCompressMB");
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
index 725932b9e03..02435bd172c 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
@@ -483,6 +483,9 @@ class StubGenerator: public StubCodeGenerator {
                                const XMMRegister P2L, const XMMRegister P2H,
                                const XMMRegister YTMP1, const Register rscratch);
 
+  address generate_intpoly_montgomeryMult_P256();
+  address generate_intpoly_assign();
+
   // BASE64 stubs
 
   address base64_shuffle_addr();
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_poly.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_poly1305.cpp
similarity index 100%
rename from src/hotspot/cpu/x86/stubGenerator_x86_64_poly.cpp
rename to src/hotspot/cpu/x86/stubGenerator_x86_64_poly1305.cpp
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_poly_mont.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_poly_mont.cpp
new file mode 100644
index 00000000000..25ee6807249
--- /dev/null
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_poly_mont.cpp
@@ -0,0 +1,376 @@
+/*
+ * Copyright (c) 2024, Intel Corporation. All rights reserved.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "macroAssembler_x86.hpp"
+#include "stubGenerator_x86_64.hpp"
+
+#define __ _masm->
+
+ATTRIBUTE_ALIGNED(64) uint64_t MODULUS_P256[] = {
+  0x000fffffffffffffULL, 0x00000fffffffffffULL,
+  0x0000000000000000ULL, 0x0000001000000000ULL,
+  0x0000ffffffff0000ULL, 0x0000000000000000ULL,
+  0x0000000000000000ULL, 0x0000000000000000ULL
+};
+static address modulus_p256() {
+  return (address)MODULUS_P256;
+}
+
+ATTRIBUTE_ALIGNED(64) uint64_t P256_MASK52[] = {
+  0x000fffffffffffffULL, 0x000fffffffffffffULL,
+  0x000fffffffffffffULL, 0x000fffffffffffffULL,
+  0xffffffffffffffffULL, 0xffffffffffffffffULL,
+  0xffffffffffffffffULL, 0xffffffffffffffffULL,
+};
+static address p256_mask52() {
+  return (address)P256_MASK52;
+}
+
+ATTRIBUTE_ALIGNED(64) uint64_t SHIFT1R[] = {
+  0x0000000000000001ULL, 0x0000000000000002ULL,
+  0x0000000000000003ULL, 0x0000000000000004ULL,
+  0x0000000000000005ULL, 0x0000000000000006ULL,
+  0x0000000000000007ULL, 0x0000000000000000ULL,
+};
+static address shift_1R() {
+  return (address)SHIFT1R;
+}
+
+ATTRIBUTE_ALIGNED(64) uint64_t SHIFT1L[] = {
+  0x0000000000000007ULL, 0x0000000000000000ULL,
+  0x0000000000000001ULL, 0x0000000000000002ULL,
+  0x0000000000000003ULL, 0x0000000000000004ULL,
+  0x0000000000000005ULL, 0x0000000000000006ULL,
+};
+static address shift_1L() {
+  return (address)SHIFT1L;
+}
+
+/**
+ * Unrolled Word-by-Word Montgomery Multiplication
+ * r = a * b * 2^-260 (mod P)
+ *
+ * Reference [1]: Shay Gueron and Vlad Krasnov
+ *    "Fast Prime Field Elliptic Curve Cryptography with 256 Bit Primes"
+ *    See Figure 5. "Algorithm 2: Word-by-Word Montgomery Multiplication for a Montgomery
+ *    Friendly modulus p". Note: Step 6. Skipped; Instead use numAdds to reuse existing overflow
+ *    logic.
+ *
+ * Pseudocode:
+ *
+ *                                                     +--+--+--+--+--+--+--+--+
+ *   M = load(*modulus_p256)                           | 0| 0| 0|m5|m4|m3|m2|m1|
+ *                                                     +--+--+--+--+--+--+--+--+
+ *   A = load(*aLimbs)                                 | 0| 0| 0|a5|a4|a3|a2|a1|
+ *                                                     +--+--+--+--+--+--+--+--+
+ *   Acc1 = 0                                          | 0| 0| 0| 0| 0| 0| 0| 0|
+ *                                                     +--+--+--+--+--+--+--+--+
+ *      ---- for i = 0 to 4
+ *                                                     +--+--+--+--+--+--+--+--+
+ *          Acc2 = 0                                   | 0| 0| 0| 0| 0| 0| 0| 0|
+ *                                                     +--+--+--+--+--+--+--+--+
+ *          B = replicate(bLimbs[i])                   |bi|bi|bi|bi|bi|bi|bi|bi|
+ *                                                     +--+--+--+--+--+--+--+--+
+ *                                                     +--+--+--+--+--+--+--+--+
+ *                                               Acc1+=| 0| 0| 0|c5|c4|c3|c2|c1|
+ *                                                    *| 0| 0| 0|a5|a4|a3|a2|a1|
+ *          Acc1 += A *  B                             |bi|bi|bi|bi|bi|bi|bi|bi|
+ *                                                     +--+--+--+--+--+--+--+--+
+ *                                               Acc2+=| 0| 0| 0| 0| 0| 0| 0| 0|
+ *                                                   *h| 0| 0| 0|a5|a4|a3|a2|a1|
+ *          Acc2 += A *h B                             |bi|bi|bi|bi|bi|bi|bi|bi|
+ *                                                     +--+--+--+--+--+--+--+--+
+ *          N = replicate(Acc1[0])                     |n0|n0|n0|n0|n0|n0|n0|n0|
+ *                                                     +--+--+--+--+--+--+--+--+
+ *                                                     +--+--+--+--+--+--+--+--+
+ *                                               Acc1+=| 0| 0| 0|c5|c4|c3|c2|c1|
+ *                                                    *| 0| 0| 0|m5|m4|m3|m2|m1|
+ *          Acc1 += M *  N                             |n0|n0|n0|n0|n0|n0|n0|n0| Note: 52 low bits of Acc1[0] == 0 due to Montgomery!
+ *                                                     +--+--+--+--+--+--+--+--+
+ *                                               Acc2+=| 0| 0| 0|d5|d4|d3|d2|d1|
+ *                                                   *h| 0| 0| 0|m5|m4|m3|m2|m1|
+ *          Acc2 += M *h N                             |n0|n0|n0|n0|n0|n0|n0|n0|
+ *                                                     +--+--+--+--+--+--+--+--+
+ *          if (i == 4) break;
+ *          // Combine high/low partial sums Acc1 + Acc2
+ *                                                     +--+--+--+--+--+--+--+--+
+ *          carry = Acc1[0] >> 52                      | 0| 0| 0| 0| 0| 0| 0|c1|
+ *                                                     +--+--+--+--+--+--+--+--+
+ *          Acc2[0] += carry
+ *                                                     +--+--+--+--+--+--+--+--+
+ *          Acc1 = Acc1 shift one q element>>          | 0| 0| 0| 0|c5|c4|c3|c2|
+ *                                                     +--+--+--+--+--+--+--+--+
+ *          Acc1 = Acc1 + Acc2
+ *      ---- done
+ *   // Last Carry round: Combine high/low partial sums Acc1<high_bits> + Acc1 + Acc2
+ *   carry = Acc1 >> 52
+ *   Acc1 = Acc1 shift one q element >>
+ *   Acc1  = mask52(Acc1)
+ *   Acc2  += carry
+ *   Acc1 = Acc1 + Acc2
+ *   output to rLimbs
+ */
+void montgomeryMultiply(const Register aLimbs, const Register bLimbs, const Register rLimbs, const Register tmp, MacroAssembler* _masm) {
+  Register t0 = tmp;
+  Register rscratch = tmp;
+
+  // Inputs
+  XMMRegister A = xmm0;
+  XMMRegister B = xmm1;
+  XMMRegister T = xmm2;
+
+  // Intermediates
+  XMMRegister Acc1 = xmm10;
+  XMMRegister Acc2 = xmm11;
+  XMMRegister N    = xmm12;
+  XMMRegister carry = xmm13;
+
+  // // Constants
+  XMMRegister modulus = xmm20;
+  XMMRegister shift1L = xmm21;
+  XMMRegister shift1R = xmm22;
+  XMMRegister mask52  = xmm23;
+  KRegister limb0    = k1;
+  KRegister allLimbs = k2;
+
+  __ mov64(t0, 0x1);
+  __ kmovql(limb0, t0);
+  __ mov64(t0, 0x1f);
+  __ kmovql(allLimbs, t0);
+  __ evmovdquq(shift1L, allLimbs, ExternalAddress(shift_1L()), false, Assembler::AVX_512bit, rscratch);
+  __ evmovdquq(shift1R, allLimbs, ExternalAddress(shift_1R()), false, Assembler::AVX_512bit, rscratch);
+  __ evmovdquq(mask52, allLimbs, ExternalAddress(p256_mask52()), false, Assembler::AVX_512bit, rscratch);
+
+  // M = load(*modulus_p256)
+  __ evmovdquq(modulus, allLimbs, ExternalAddress(modulus_p256()), false, Assembler::AVX_512bit, rscratch);
+
+  // A = load(*aLimbs);  masked evmovdquq() can be slow. Instead load full 256bit, and compbine with 64bit
+  __ evmovdquq(A, Address(aLimbs, 8), Assembler::AVX_256bit);
+  __ evpermq(A, allLimbs, shift1L, A, false, Assembler::AVX_512bit);
+  __ movq(T, Address(aLimbs, 0));
+  __ evporq(A, A, T, Assembler::AVX_512bit);
+
+  // Acc1 = 0
+  __ vpxorq(Acc1, Acc1, Acc1, Assembler::AVX_512bit);
+  for (int i = 0; i< 5; i++) {
+      // Acc2 = 0
+      __ vpxorq(Acc2, Acc2, Acc2, Assembler::AVX_512bit);
+
+      // B = replicate(bLimbs[i])
+      __ vpbroadcastq(B, Address(bLimbs, i*8), Assembler::AVX_512bit);
+
+      // Acc1 += A * B
+      __ evpmadd52luq(Acc1, A, B, Assembler::AVX_512bit);
+
+      // Acc2 += A *h B
+      __ evpmadd52huq(Acc2, A, B, Assembler::AVX_512bit);
+
+      // N = replicate(Acc1[0])
+      __ vpbroadcastq(N, Acc1, Assembler::AVX_512bit);
+
+      // Acc1 += M *  N
+      __ evpmadd52luq(Acc1, modulus, N, Assembler::AVX_512bit);
+
+      // Acc2 += M *h N
+      __ evpmadd52huq(Acc2, modulus, N, Assembler::AVX_512bit);
+
+      if (i == 4) break;
+
+      // Combine high/low partial sums Acc1 + Acc2
+
+      // carry = Acc1[0] >> 52
+      __ evpsrlq(carry, limb0, Acc1, 52, true, Assembler::AVX_512bit);
+
+      // Acc2[0] += carry
+      __ evpaddq(Acc2, limb0, carry, Acc2, true, Assembler::AVX_512bit);
+
+      // Acc1 = Acc1 shift one q element >>
+      __ evpermq(Acc1, allLimbs, shift1R, Acc1, false, Assembler::AVX_512bit);
+
+      // Acc1 = Acc1 + Acc2
+      __ vpaddq(Acc1, Acc1, Acc2, Assembler::AVX_512bit);
+  }
+
+  // Last Carry round: Combine high/low partial sums Acc1<high_bits> + Acc1 + Acc2
+  // carry = Acc1 >> 52
+  __ evpsrlq(carry, allLimbs, Acc1, 52, true, Assembler::AVX_512bit);
+
+  // Acc1 = Acc1 shift one q element >>
+  __ evpermq(Acc1, allLimbs, shift1R, Acc1, false, Assembler::AVX_512bit);
+
+  // Acc1  = mask52(Acc1)
+  __ evpandq(Acc1, Acc1, mask52, Assembler::AVX_512bit); // Clear top 12 bits
+
+  // Acc2 += carry
+  __ evpaddq(Acc2, allLimbs, carry, Acc2, true, Assembler::AVX_512bit);
+
+  // Acc1 = Acc1 + Acc2
+  __ vpaddq(Acc1, Acc1, Acc2, Assembler::AVX_512bit);
+
+  // output to rLimbs (1 + 4 limbs)
+  __ movq(Address(rLimbs, 0), Acc1);
+  __ evpermq(Acc1, k0, shift1R, Acc1, true, Assembler::AVX_512bit);
+  __ evmovdquq(Address(rLimbs, 8), k0, Acc1, true, Assembler::AVX_256bit);
+}
+
+address StubGenerator::generate_intpoly_montgomeryMult_P256() {
+  __ align(CodeEntryAlignment);
+  StubCodeMark mark(this, "StubRoutines", "intpoly_montgomeryMult_P256");
+  address start = __ pc();
+  __ enter();
+
+  // Register Map
+  const Register aLimbs  = c_rarg0; // rdi | rcx
+  const Register bLimbs  = c_rarg1; // rsi | rdx
+  const Register rLimbs  = c_rarg2; // rdx | r8
+  const Register tmp     = r9;
+
+  montgomeryMultiply(aLimbs, bLimbs, rLimbs, tmp, _masm);
+  __ mov64(rax, 0x1); // Return 1 (Fig. 5, Step 6 [1] skipped in montgomeryMultiply)
+
+  __ leave();
+  __ ret(0);
+  return start;
+}
+
+// A = B if select
+// Must be:
+//  - constant time (i.e. no branches)
+//  - no-side channel (i.e. all memory must always be accessed, and in same order)
+void assign_avx(XMMRegister A, Address aAddr, XMMRegister B, Address bAddr, KRegister select, int vector_len, MacroAssembler* _masm) {
+  __ evmovdquq(A, aAddr, vector_len);
+  __ evmovdquq(B, bAddr, vector_len);
+  __ evmovdquq(A, select, B, true, vector_len);
+  __ evmovdquq(aAddr, A, vector_len);
+}
+
+void assign_scalar(Address aAddr, Address bAddr, Register select, Register tmp, MacroAssembler* _masm) {
+  // Original java:
+  // long dummyLimbs = maskValue & (a[i] ^ b[i]);
+  // a[i] = dummyLimbs ^ a[i];
+
+  __ movq(tmp, aAddr);
+  __ xorq(tmp, bAddr);
+  __ andq(tmp, select);
+  __ xorq(aAddr, tmp);
+}
+
+address StubGenerator::generate_intpoly_assign() {
+  // KNOWN Lengths:
+  //   MontgomeryIntPolynP256:  5 = 4 + 1
+  //   IntegerPolynomial1305:   5 = 4 + 1
+  //   IntegerPolynomial25519: 10 = 8 + 2
+  //   IntegerPolynomialP256:  10 = 8 + 2
+  //   Curve25519OrderField:   10 = 8 + 2
+  //   Curve25519OrderField:   10 = 8 + 2
+  //   P256OrderField:         10 = 8 + 2
+  //   IntegerPolynomialP384:  14 = 8 + 4 + 2
+  //   P384OrderField:         14 = 8 + 4 + 2
+  //   IntegerPolynomial448:   16 = 8 + 8
+  //   Curve448OrderField:     16 = 8 + 8
+  //   Curve448OrderField:     16 = 8 + 8
+  //   IntegerPolynomialP521:  19 = 8 + 8 + 2 + 1
+  //   P521OrderField:         19 = 8 + 8 + 2 + 1
+  // Special Cases 5, 10, 14, 16, 19
+
+  __ align(CodeEntryAlignment);
+  StubCodeMark mark(this, "StubRoutines", "intpoly_assign");
+  address start = __ pc();
+  __ enter();
+
+  // Inputs
+  const Register set     = c_rarg0;
+  const Register aLimbs  = c_rarg1;
+  const Register bLimbs  = c_rarg2;
+  const Register length  = c_rarg3;
+  XMMRegister A = xmm0;
+  XMMRegister B = xmm1;
+
+  Register tmp = r9;
+  KRegister select = k1;
+  Label L_Length5, L_Length10, L_Length14, L_Length16, L_Length19, L_DefaultLoop, L_Done;
+
+  __ negq(set);
+  __ kmovql(select, set);
+
+  // NOTE! Crypto code cannot branch on user input. However; allowed to branch on number of limbs;
+  // Number of limbs is a constant in each IntegerPolynomial (i.e. this side-channel branch leaks
+  //   number of limbs which is not a secret)
+  __ cmpl(length, 5);
+  __ jcc(Assembler::equal, L_Length5);
+  __ cmpl(length, 10);
+  __ jcc(Assembler::equal, L_Length10);
+  __ cmpl(length, 14);
+  __ jcc(Assembler::equal, L_Length14);
+  __ cmpl(length, 16);
+  __ jcc(Assembler::equal, L_Length16);
+  __ cmpl(length, 19);
+  __ jcc(Assembler::equal, L_Length19);
+
+  // Default copy loop (UNLIKELY)
+  __ cmpl(length, 0);
+  __ jcc(Assembler::lessEqual, L_Done);
+  __ bind(L_DefaultLoop);
+  assign_scalar(Address(aLimbs, 0), Address(bLimbs, 0), set, tmp, _masm);
+  __ subl(length, 1);
+  __ lea(aLimbs, Address(aLimbs,8));
+  __ lea(bLimbs, Address(bLimbs,8));
+  __ cmpl(length, 0);
+  __ jcc(Assembler::greater, L_DefaultLoop);
+  __ jmp(L_Done);
+
+  __ bind(L_Length5); // 1 + 4
+  assign_scalar(Address(aLimbs, 0), Address(bLimbs, 0), set, tmp, _masm);
+  assign_avx(A, Address(aLimbs, 8), B, Address(bLimbs, 8), select, Assembler::AVX_256bit, _masm);
+  __ jmp(L_Done);
+
+  __ bind(L_Length10); // 2 + 8
+  assign_avx(A, Address(aLimbs, 0),  B, Address(bLimbs, 0),  select, Assembler::AVX_128bit, _masm);
+  assign_avx(A, Address(aLimbs, 16), B, Address(bLimbs, 16), select, Assembler::AVX_512bit, _masm);
+  __ jmp(L_Done);
+
+  __ bind(L_Length14); // 2 + 4 + 8
+  assign_avx(A, Address(aLimbs, 0),  B, Address(bLimbs, 0),  select, Assembler::AVX_128bit, _masm);
+  assign_avx(A, Address(aLimbs, 16), B, Address(bLimbs, 16), select, Assembler::AVX_256bit, _masm);
+  assign_avx(A, Address(aLimbs, 48), B, Address(bLimbs, 48), select, Assembler::AVX_512bit, _masm);
+  __ jmp(L_Done);
+
+  __ bind(L_Length16); // 8 + 8
+  assign_avx(A, Address(aLimbs, 0),  B, Address(bLimbs, 0),  select, Assembler::AVX_512bit, _masm);
+  assign_avx(A, Address(aLimbs, 64), B, Address(bLimbs, 64), select, Assembler::AVX_512bit, _masm);
+  __ jmp(L_Done);
+
+  __ bind(L_Length19); // 1 + 2 + 8 + 8
+  assign_scalar(Address(aLimbs, 0), Address(bLimbs, 0), set, tmp, _masm);
+  assign_avx(A, Address(aLimbs, 8),  B, Address(bLimbs, 8),  select, Assembler::AVX_128bit, _masm);
+  assign_avx(A, Address(aLimbs, 24), B, Address(bLimbs, 24), select, Assembler::AVX_512bit, _masm);
+  assign_avx(A, Address(aLimbs, 88), B, Address(bLimbs, 88), select, Assembler::AVX_512bit, _masm);
+
+  __ bind(L_Done);
+  __ leave();
+  __ ret(0);
+  return start;
+}
diff --git a/src/hotspot/cpu/x86/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp
index 0bffb1aee13..fbc952fc8d1 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp
@@ -1366,6 +1366,18 @@ void VM_Version::get_processor_features() {
     FLAG_SET_DEFAULT(UsePoly1305Intrinsics, false);
   }
 
+#ifdef _LP64
+  if (supports_avx512ifma() && supports_avx512vlbw()) {
+    if (FLAG_IS_DEFAULT(UseIntPolyIntrinsics)) {
+      FLAG_SET_DEFAULT(UseIntPolyIntrinsics, true);
+    }
+  } else
+#endif
+  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;
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 5d1c513b10f..f3ad721dfcb 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -12094,7 +12094,7 @@ instruct partialSubtypeCheckConstSuper(rsi_RegP sub, rax_RegP super_reg, immP su
   effect(KILL cr, TEMP temp1, TEMP temp2, TEMP temp3, TEMP temp4);
 
   ins_cost(700);  // smaller than the next version
-  format %{ "partialSubtypeCheck $result, $sub, super" %}
+  format %{ "partialSubtypeCheck $result, $sub, $super_reg, $super_con" %}
 
   ins_encode %{
     u1 super_klass_slot = ((Klass*)$super_con$$constant)->hash_slot();
diff --git a/src/hotspot/os/bsd/globals_bsd.hpp b/src/hotspot/os/bsd/globals_bsd.hpp
index 66fae6a49d2..850d491a11f 100644
--- a/src/hotspot/os/bsd/globals_bsd.hpp
+++ b/src/hotspot/os/bsd/globals_bsd.hpp
@@ -35,7 +35,7 @@
                          range,                                         \
                          constraint)                                    \
                                                                         \
-  AARCH64_ONLY(develop(bool, AssertWXAtThreadSync, false,                \
+  AARCH64_ONLY(develop(bool, AssertWXAtThreadSync, true,                \
           "Conservatively check W^X thread state at possible safepoint" \
           "or handshake"))
 
diff --git a/src/hotspot/os/linux/systemMemoryBarrier_linux.cpp b/src/hotspot/os/linux/systemMemoryBarrier_linux.cpp
index 892d825b40c..a6b26928520 100644
--- a/src/hotspot/os/linux/systemMemoryBarrier_linux.cpp
+++ b/src/hotspot/os/linux/systemMemoryBarrier_linux.cpp
@@ -41,6 +41,8 @@
   #define SYS_membarrier 365
   #elif defined(AARCH64)
   #define SYS_membarrier 283
+  #elif defined(ARM32)
+  #define SYS_membarrier 389
   #elif defined(ALPHA)
   #define SYS_membarrier 517
   #else
diff --git a/src/hotspot/share/c1/c1_Compiler.cpp b/src/hotspot/share/c1/c1_Compiler.cpp
index 6e518b0213b..3a902bb4230 100644
--- a/src/hotspot/share/c1/c1_Compiler.cpp
+++ b/src/hotspot/share/c1/c1_Compiler.cpp
@@ -235,7 +235,7 @@ bool Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
   case vmIntrinsics::_counterTime:
 #endif
   case vmIntrinsics::_getObjectSize:
-#if defined(X86) || defined(AARCH64)
+#if defined(X86) || defined(AARCH64) || defined(S390)
   case vmIntrinsics::_clone:
 #endif
     break;
diff --git a/src/hotspot/share/c1/c1_LIR.cpp b/src/hotspot/share/c1/c1_LIR.cpp
index 4017a5324b5..bbf802aca13 100644
--- a/src/hotspot/share/c1/c1_LIR.cpp
+++ b/src/hotspot/share/c1/c1_LIR.cpp
@@ -353,7 +353,7 @@ LIR_OpArrayCopy::LIR_OpArrayCopy(LIR_Opr src, LIR_Opr src_pos, LIR_Opr dst, LIR_
   , _tmp(tmp)
   , _expected_type(expected_type)
   , _flags(flags) {
-#if defined(X86) || defined(AARCH64)
+#if defined(X86) || defined(AARCH64) || defined(S390)
   if (expected_type != nullptr && flags == 0) {
     _stub = nullptr;
   } else {
diff --git a/src/hotspot/share/c1/c1_ValueStack.cpp b/src/hotspot/share/c1/c1_ValueStack.cpp
index e7bf714a367..41424e36d07 100644
--- a/src/hotspot/share/c1/c1_ValueStack.cpp
+++ b/src/hotspot/share/c1/c1_ValueStack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@ ValueStack::ValueStack(IRScope* scope, ValueStack* caller_state)
 , _locals(scope->method()->max_locals(), scope->method()->max_locals(), nullptr)
 , _stack(scope->method()->max_stack())
 , _locks(nullptr)
+, _force_reexecute(false)
 {
   verify();
 }
@@ -50,6 +51,7 @@ ValueStack::ValueStack(ValueStack* copy_from, Kind kind, int bci)
   , _locals(copy_from->locals_size_for_copy(kind))
   , _stack(copy_from->stack_size_for_copy(kind))
   , _locks(copy_from->locks_size() == 0 ? nullptr : new Values(copy_from->locks_size()))
+  , _force_reexecute(false)
 {
   switch (kind) {
   case EmptyExceptionState:
diff --git a/src/hotspot/share/cds/classListParser.cpp b/src/hotspot/share/cds/classListParser.cpp
index 4e49cd3d881..79119a997de 100644
--- a/src/hotspot/share/cds/classListParser.cpp
+++ b/src/hotspot/share/cds/classListParser.cpp
@@ -61,7 +61,7 @@ ClassListParser::ClassListParser(const char* file, ParseMode parse_mode) :
     _file_input(do_open(file), /* need_close=*/true),
     _input_stream(&_file_input) {
   log_info(cds)("Parsing %s%s", file,
-                (parse_mode == _parse_lambda_forms_invokers_only) ? " (lambda form invokers only)" : "");
+                parse_lambda_forms_invokers_only() ? " (lambda form invokers only)" : "");
   if (!_file_input.is_open()) {
     char errmsg[JVM_MAXPATHLEN];
     os::lasterror(errmsg, JVM_MAXPATHLEN);
@@ -102,120 +102,108 @@ ClassListParser::~ClassListParser() {
   _instance = nullptr;
 }
 
-int ClassListParser::parse(TRAPS) {
-  int class_count = 0;
-
+void ClassListParser::parse(TRAPS) {
   for (; !_input_stream.done(); _input_stream.next()) {
     _line = _input_stream.current_line();
-    if (*_line == '#') { // comment
-      continue;
-    }
-    if (!parse_one_line()) {
-      break;
-    }
-
-    if (lambda_form_line()) {
-      // The current line is "@lambda-form-invoker ...". It has been recorded in LambdaFormInvokers,
-      // and will be processed later.
-      continue;
-    }
-
-    if (_parse_mode == _parse_lambda_forms_invokers_only) {
-      continue;
+    clean_up_input_line();
+
+    // Each line in the classlist can be one of three forms:
+    if (_line[0] == '#') {
+      // A comment; ignore it
+    } else if (_line[0] == '@') {
+      // @xxx - a tag like @lambda-proxy, to be parsed by parse_at_tags()
+      parse_at_tags(CHECK);
+    } else {
+      // A class name, followed by optional attributes. E.g.
+      //   java/lang/String
+      //   java/lang/Object id: 1
+      //   my/pkg/TestClass id: 5 super: 1 interfaces: 3 4 source: foo.jar
+      parse_class_name_and_attributes(CHECK);
     }
+  }
+}
 
-    check_class_name(_class_name);
-    TempNewSymbol class_name_symbol = SymbolTable::new_symbol(_class_name);
-    if (_indy_items->length() > 0) {
-      // The current line is "@lambda-proxy class_name". Load the proxy class.
-      resolve_indy(THREAD, class_name_symbol);
-      class_count++;
-      continue;
-    }
+void ClassListParser::parse_class_name_and_attributes(TRAPS) {
+  read_class_name_and_attributes();
 
-    Klass* klass = load_current_class(class_name_symbol, THREAD);
-    if (HAS_PENDING_EXCEPTION) {
-      if (PENDING_EXCEPTION->is_a(vmClasses::OutOfMemoryError_klass())) {
-        // If we have run out of memory, don't try to load the rest of the classes in
-        // the classlist. Throw an exception, which will terminate the dumping process.
-        return 0; // THROW
-      }
+  if (parse_lambda_forms_invokers_only()) {
+    return;
+  }
 
-      ResourceMark rm(THREAD);
-      char* ex_msg = (char*)"";
-      oop message = java_lang_Throwable::message(PENDING_EXCEPTION);
-      if (message != nullptr) {
-        ex_msg = java_lang_String::as_utf8_string(message);
-      }
-      log_warning(cds)("%s: %s", PENDING_EXCEPTION->klass()->external_name(), ex_msg);
-      // We might have an invalid class name or an bad class. Warn about it
-      // and keep going to the next line.
-      CLEAR_PENDING_EXCEPTION;
-      log_warning(cds)("Preload Warning: Cannot find %s", _class_name);
-      continue;
+  check_class_name(_class_name);
+  TempNewSymbol class_name_symbol = SymbolTable::new_symbol(_class_name);
+  Klass* klass = load_current_class(class_name_symbol, THREAD);
+  if (HAS_PENDING_EXCEPTION) {
+    if (PENDING_EXCEPTION->is_a(vmClasses::OutOfMemoryError_klass())) {
+      // If we have run out of memory, don't try to load the rest of the classes in
+      // the classlist. Throw an exception, which will terminate the dumping process.
+      return; // THROW
     }
 
-    assert(klass != nullptr, "sanity");
-    if (log_is_enabled(Trace, cds)) {
-      ResourceMark rm(THREAD);
-      log_trace(cds)("Shared spaces preloaded: %s", klass->external_name());
+    ResourceMark rm(THREAD);
+    char* ex_msg = (char*)"";
+    oop message = java_lang_Throwable::message(PENDING_EXCEPTION);
+    if (message != nullptr) {
+      ex_msg = java_lang_String::as_utf8_string(message);
     }
+    log_warning(cds)("%s: %s", PENDING_EXCEPTION->klass()->external_name(), ex_msg);
+    // We might have an invalid class name or an bad class. Warn about it
+    // and keep going to the next line.
+    CLEAR_PENDING_EXCEPTION;
+    log_warning(cds)("Preload Warning: Cannot find %s", _class_name);
+    return;
+  }
 
-    if (klass->is_instance_klass()) {
-      InstanceKlass* ik = InstanceKlass::cast(klass);
+  assert(klass != nullptr, "sanity");
+  if (log_is_enabled(Trace, cds)) {
+    ResourceMark rm(THREAD);
+    log_trace(cds)("Shared spaces preloaded: %s", klass->external_name());
+  }
 
-      // Link the class to cause the bytecodes to be rewritten and the
-      // cpcache to be created. The linking is done as soon as classes
-      // are loaded in order that the related data structures (klass and
-      // cpCache) are located together.
-      MetaspaceShared::try_link_class(THREAD, ik);
-    }
+  if (klass->is_instance_klass()) {
+    InstanceKlass* ik = InstanceKlass::cast(klass);
 
-    class_count++;
+    // Link the class to cause the bytecodes to be rewritten and the
+    // cpcache to be created. The linking is done as soon as classes
+    // are loaded in order that the related data structures (klass and
+    // cpCache) are located together.
+    MetaspaceShared::try_link_class(THREAD, ik);
   }
-
-  return class_count;
 }
 
-bool ClassListParser::parse_one_line() {
-  {
-    int len = (int)strlen(_line);
-    int i;
-    // Replace \t\r\n\f with ' '
-    for (i=0; i<len; i++) {
-      if (_line[i] == '\t' || _line[i] == '\r' || _line[i] == '\n' || _line[i] == '\f') {
-        _line[i] = ' ';
-      }
+void ClassListParser::clean_up_input_line() {
+  int len = (int)strlen(_line);
+  int i;
+  // Replace \t\r\n\f with ' '
+  for (i=0; i<len; i++) {
+    if (_line[i] == '\t' || _line[i] == '\r' || _line[i] == '\n' || _line[i] == '\f') {
+      _line[i] = ' ';
     }
+  }
 
-    // Remove trailing newline/space
-    while (len > 0) {
-      if (_line[len-1] == ' ') {
-        _line[len-1] = '\0';
-        len --;
-      } else {
-        break;
-      }
+  // Remove trailing newline/space
+  while (len > 0) {
+    if (_line[len-1] == ' ') {
+      _line[len-1] = '\0';
+      len --;
+    } else {
+      break;
     }
-    _line_len = len;
   }
+  _line_len = len;
+}
 
+void ClassListParser::read_class_name_and_attributes() {
   _class_name = _line;
   _id = _unspecified;
   _super = _unspecified;
   _interfaces->clear();
   _source = nullptr;
   _interfaces_specified = false;
-  _indy_items->clear();
-  _lambda_form_line = false;
-
-  if (_line[0] == '@') {
-    return parse_at_tags();
-  }
 
   if ((_token = strchr(_line, ' ')) == nullptr) {
-    // No optional arguments are specified.
-    return true;
+    // No optional attributes are specified.
+    return;
   }
 
   // Mark the end of the name, and go to the next input char
@@ -257,10 +245,9 @@ bool ClassListParser::parse_one_line() {
   //     # the class is loaded from classpath
   //     id may be specified
   //     super, interfaces, loader must not be specified
-  return true;
 }
 
-void ClassListParser::split_tokens_by_whitespace(int offset) {
+void ClassListParser::split_tokens_by_whitespace(int offset, GrowableArray<const char*>* items) {
   int start = offset;
   int end;
   bool done = false;
@@ -273,7 +260,7 @@ void ClassListParser::split_tokens_by_whitespace(int offset) {
     } else {
       _line[end] = '\0';
     }
-    _indy_items->append(_line + start);
+    items->append(_line + start);
     start = ++end;
   }
 }
@@ -290,29 +277,30 @@ int ClassListParser::split_at_tag_from_line() {
   return (int)(ptr - _line);
 }
 
-bool ClassListParser::parse_at_tags() {
+void ClassListParser::parse_at_tags(TRAPS) {
   assert(_line[0] == '@', "must be");
-  int offset;
-  if ((offset = split_at_tag_from_line()) == 0) {
-    return false;
-  }
+  int offset = split_at_tag_from_line();
+  assert(offset > 0, "would have exited VM");
 
   if (strcmp(_token, LAMBDA_PROXY_TAG) == 0) {
-    split_tokens_by_whitespace(offset);
+    _indy_items->clear();
+    split_tokens_by_whitespace(offset, _indy_items);
     if (_indy_items->length() < 2) {
       error("Line with @ tag has too few items \"%s\" line #%zu", _token, lineno());
-      return false;
     }
-    // set the class name
-    _class_name = _indy_items->at(0);
-    return true;
+    if (!parse_lambda_forms_invokers_only()) {
+      _class_name = _indy_items->at(0);
+      check_class_name(_class_name);
+      TempNewSymbol class_name_symbol = SymbolTable::new_symbol(_class_name);
+      if (_indy_items->length() > 0) {
+        // The current line is "@lambda-proxy class_name". Load the proxy class.
+        resolve_indy(THREAD, class_name_symbol);
+      }
+    }
   } else if (strcmp(_token, LAMBDA_FORM_TAG) == 0) {
     LambdaFormInvokers::append(os::strdup((const char*)(_line + offset), mtInternal));
-    _lambda_form_line = true;
-    return true;
   } else {
     error("Invalid @ tag at the beginning of line \"%s\" line #%zu", _token, lineno());
-    return false;
   }
 }
 
@@ -441,9 +429,9 @@ void ClassListParser::error(const char* msg, ...) {
     }
     jio_fprintf(defaultStream::error_stream(), "^\n");
   }
+  va_end(ap);
 
   vm_exit_during_initialization("class list format error.", nullptr);
-  va_end(ap);
 }
 
 void ClassListParser::check_class_name(const char* class_name) {
diff --git a/src/hotspot/share/cds/classListParser.hpp b/src/hotspot/share/cds/classListParser.hpp
index a383e04d8e6..50ede4f6dff 100644
--- a/src/hotspot/share/cds/classListParser.hpp
+++ b/src/hotspot/share/cds/classListParser.hpp
@@ -104,7 +104,6 @@ class ClassListParser : public StackObj {
   GrowableArray<int>* _interfaces;
   bool                _interfaces_specified;
   const char*         _source;
-  bool                _lambda_form_line;
   ParseMode           _parse_mode;
 
   bool parse_int_option(const char* option_name, int* value);
@@ -120,7 +119,9 @@ class ClassListParser : public StackObj {
 
   void resolve_indy(JavaThread* current, Symbol* class_name_symbol);
   void resolve_indy_impl(Symbol* class_name_symbol, TRAPS);
-  bool parse_one_line();
+  void clean_up_input_line();
+  void read_class_name_and_attributes();
+  void parse_class_name_and_attributes(TRAPS);
   Klass* load_current_class(Symbol* class_name_symbol, TRAPS);
 
   size_t lineno() { return _input_stream.lineno(); }
@@ -129,9 +130,9 @@ class ClassListParser : public StackObj {
   ~ClassListParser();
 
 public:
-  static int parse_classlist(const char* classlist_path, ParseMode parse_mode, TRAPS) {
+  static void parse_classlist(const char* classlist_path, ParseMode parse_mode, TRAPS) {
     ClassListParser parser(classlist_path, parse_mode);
-    return parser.parse(THREAD); // returns the number of classes loaded.
+    parser.parse(THREAD);
   }
 
   static bool is_parsing_thread();
@@ -141,10 +142,10 @@ class ClassListParser : public StackObj {
     return _instance;
   }
 
-  int parse(TRAPS);
-  void split_tokens_by_whitespace(int offset);
+  void parse(TRAPS);
+  void split_tokens_by_whitespace(int offset, GrowableArray<const char*>* items);
   int split_at_tag_from_line();
-  bool parse_at_tags();
+  void parse_at_tags(TRAPS);
   char* _token;
   void error(const char* msg, ...);
   void parse_int(int* value);
@@ -154,6 +155,9 @@ class ClassListParser : public StackObj {
   void skip_whitespaces();
   void skip_non_whitespaces();
 
+  bool parse_lambda_forms_invokers_only() {
+    return _parse_mode == _parse_lambda_forms_invokers_only;
+  }
   bool is_id_specified() {
     return _id != _unspecified;
   }
@@ -184,8 +188,6 @@ class ClassListParser : public StackObj {
 
   bool is_loading_from_source();
 
-  bool lambda_form_line() { return _lambda_form_line; }
-
   // Look up the super or interface of the current class being loaded
   // (in this->load_current_class()).
   InstanceKlass* lookup_super_for_current_class(Symbol* super_name);
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 93c5c1a1e3b..6213b9848f1 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -225,6 +225,14 @@ static bool shared_base_too_high(char* specified_base, char* aligned_base, size_
 static char* compute_shared_base(size_t cds_max) {
   char* specified_base = (char*)SharedBaseAddress;
   char* aligned_base = align_up(specified_base, MetaspaceShared::core_region_alignment());
+  if (UseCompressedClassPointers) {
+    aligned_base = align_up(specified_base, Metaspace::reserve_alignment());
+  }
+
+  if (aligned_base != specified_base) {
+    log_info(cds)("SharedBaseAddress (" INTPTR_FORMAT ") aligned up to " INTPTR_FORMAT,
+                   p2i(specified_base), p2i(aligned_base));
+  }
 
   const char* err = nullptr;
   if (shared_base_too_high(specified_base, aligned_base, cds_max)) {
@@ -737,18 +745,18 @@ void MetaspaceShared::preload_classes(TRAPS) {
   }
 
   log_info(cds)("Loading classes to share ...");
-  int class_count = ClassListParser::parse_classlist(classlist_path,
-                                                     ClassListParser::_parse_all, CHECK);
+  ClassListParser::parse_classlist(classlist_path,
+                                   ClassListParser::_parse_all, CHECK);
   if (ExtraSharedClassListFile) {
-    class_count += ClassListParser::parse_classlist(ExtraSharedClassListFile,
-                                                    ClassListParser::_parse_all, CHECK);
+    ClassListParser::parse_classlist(ExtraSharedClassListFile,
+                                     ClassListParser::_parse_all, CHECK);
   }
   if (classlist_path != default_classlist) {
     struct stat statbuf;
     if (os::stat(default_classlist, &statbuf) == 0) {
       // File exists, let's use it.
-      class_count += ClassListParser::parse_classlist(default_classlist,
-                                                      ClassListParser::_parse_lambda_forms_invokers_only, CHECK);
+      ClassListParser::parse_classlist(default_classlist,
+                                       ClassListParser::_parse_lambda_forms_invokers_only, CHECK);
     }
   }
 
@@ -758,7 +766,6 @@ void MetaspaceShared::preload_classes(TRAPS) {
   CDSProtectionDomain::create_jar_manifest(dummy, strlen(dummy), CHECK);
 
   log_info(cds)("Loading classes to share: done.");
-  log_info(cds)("Shared spaces: preloaded %d classes", class_count);
 }
 
 void MetaspaceShared::preload_and_dump_impl(TRAPS) {
@@ -1260,15 +1267,15 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
   size_t archive_end_offset  = (dynamic_mapinfo == nullptr) ? static_mapinfo->mapping_end_offset() : dynamic_mapinfo->mapping_end_offset();
   size_t archive_space_size = align_up(archive_end_offset, archive_space_alignment);
 
-  // If a base address is given, it must have valid alignment and be suitable as encoding base.
-  if (base_address != nullptr) {
-    assert(is_aligned(base_address, archive_space_alignment),
-           "Archive base address invalid: " PTR_FORMAT ".", p2i(base_address));
-  }
-
   if (!Metaspace::using_class_space()) {
     // Get the simple case out of the way first:
     // no compressed class space, simple allocation.
+
+    // When running without class space, requested archive base should be aligned to cds core alignment.
+    assert(is_aligned(base_address, archive_space_alignment),
+             "Archive base address unaligned: " PTR_FORMAT ", needs alignment: %zu.",
+             p2i(base_address), archive_space_alignment);
+
     archive_space_rs = ReservedSpace(archive_space_size, archive_space_alignment,
                                      os::vm_page_size(), (char*)base_address);
     if (archive_space_rs.is_reserved()) {
@@ -1289,12 +1296,12 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
 
   const size_t class_space_alignment = Metaspace::reserve_alignment();
 
-  // To simplify matters, lets assume that metaspace alignment will always be
-  //  equal or a multiple of archive alignment.
-  assert(is_power_of_2(class_space_alignment) &&
-                       is_power_of_2(archive_space_alignment) &&
-                       class_space_alignment >= archive_space_alignment,
-                       "Sanity");
+  // When running with class space, requested archive base must satisfy both cds core alignment
+  // and class space alignment.
+  const size_t base_address_alignment = MAX2(class_space_alignment, archive_space_alignment);
+  assert(is_aligned(base_address, base_address_alignment),
+           "Archive base address unaligned: " PTR_FORMAT ", needs alignment: %zu.",
+           p2i(base_address), base_address_alignment);
 
   const size_t class_space_size = CompressedClassSpaceSize;
   assert(CompressedClassSpaceSize > 0 &&
@@ -1302,12 +1309,11 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
          "CompressedClassSpaceSize malformed: "
          SIZE_FORMAT, CompressedClassSpaceSize);
 
-  const size_t ccs_begin_offset = align_up(base_address + archive_space_size,
-                                           class_space_alignment) - base_address;
+  const size_t ccs_begin_offset = align_up(archive_space_size, class_space_alignment);
   const size_t gap_size = ccs_begin_offset - archive_space_size;
 
   const size_t total_range_size =
-      align_up(archive_space_size + gap_size + class_space_size, core_region_alignment());
+      archive_space_size + gap_size + class_space_size;
 
   assert(total_range_size > ccs_begin_offset, "must be");
   if (use_windows_memory_mapping() && use_archive_base_addr) {
@@ -1332,7 +1338,7 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
     MemTracker::record_virtual_memory_type(class_space_rs.base(), mtClass);
   } else {
     if (use_archive_base_addr && base_address != nullptr) {
-      total_space_rs = ReservedSpace(total_range_size, archive_space_alignment,
+      total_space_rs = ReservedSpace(total_range_size, base_address_alignment,
                                      os::vm_page_size(), (char*) base_address);
     } else {
       // We did not manage to reserve at the preferred address, or were instructed to relocate. In that
@@ -1350,7 +1356,7 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
     // Paranoid checks:
     assert(base_address == nullptr || (address)total_space_rs.base() == base_address,
            "Sanity (" PTR_FORMAT " vs " PTR_FORMAT ")", p2i(base_address), p2i(total_space_rs.base()));
-    assert(is_aligned(total_space_rs.base(), archive_space_alignment), "Sanity");
+    assert(is_aligned(total_space_rs.base(), base_address_alignment), "Sanity");
     assert(total_space_rs.size() == total_range_size, "Sanity");
 
     // Now split up the space into ccs and cds archive. For simplicity, just leave
diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp
index 5861ac3ac33..6d11a436f65 100644
--- a/src/hotspot/share/ci/ciEnv.cpp
+++ b/src/hotspot/share/ci/ciEnv.cpp
@@ -1139,15 +1139,17 @@ void ciEnv::register_method(ciMethod* target,
 #endif
 
       if (entry_bci == InvocationEntryBci) {
-        // If there is an old version we're done with it
-        nmethod* old = method->code();
-        if (TraceMethodReplacement && old != nullptr) {
-          ResourceMark rm;
-          char *method_name = method->name_and_sig_as_C_string();
-          tty->print_cr("Replacing method %s", method_name);
-        }
-        if (old != nullptr) {
-          old->make_not_used();
+        if (TieredCompilation) {
+          // If there is an old version we're done with it
+          nmethod* old = method->code();
+          if (TraceMethodReplacement && old != nullptr) {
+            ResourceMark rm;
+            char *method_name = method->name_and_sig_as_C_string();
+            tty->print_cr("Replacing method %s", method_name);
+          }
+          if (old != nullptr) {
+            old->make_not_used();
+          }
         }
 
         LogTarget(Info, nmethod, install) lt;
diff --git a/src/hotspot/share/classfile/vmIntrinsics.cpp b/src/hotspot/share/classfile/vmIntrinsics.cpp
index 8d4f57165e1..e60495d1f47 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.cpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.cpp
@@ -492,6 +492,10 @@ bool vmIntrinsics::disabled_by_jvm_flags(vmIntrinsics::ID id) {
   case vmIntrinsics::_poly1305_processBlocks:
     if (!UsePoly1305Intrinsics) return true;
     break;
+  case vmIntrinsics::_intpoly_montgomeryMult_P256:
+  case vmIntrinsics::_intpoly_assign:
+    if (!UseIntPolyIntrinsics) return true;
+    break;
   case vmIntrinsics::_updateBytesCRC32C:
   case vmIntrinsics::_updateDirectByteBufferCRC32C:
     if (!UseCRC32CIntrinsics) return true;
diff --git a/src/hotspot/share/classfile/vmIntrinsics.hpp b/src/hotspot/share/classfile/vmIntrinsics.hpp
index a0db1a65d3a..b8d8c40cc47 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.hpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.hpp
@@ -526,7 +526,18 @@ class methodHandle;
   do_intrinsic(_digestBase_implCompressMB, sun_security_provider_digestbase, implCompressMB_name, countPositives_signature, F_R)   \
    do_name(     implCompressMB_name,                               "implCompressMultiBlock0")                           \
                                                                                                                         \
-   /* support for java.util.Base64.Encoder*/                                                                            \
+  /* support for sun.security.util.math.intpoly.MontgomeryIntegerPolynomialP256 */                                      \
+  do_class(sun_security_util_math_intpoly_MontgomeryIntegerPolynomialP256, "sun/security/util/math/intpoly/MontgomeryIntegerPolynomialP256")  \
+  do_intrinsic(_intpoly_montgomeryMult_P256, sun_security_util_math_intpoly_MontgomeryIntegerPolynomialP256, intPolyMult_name, intPolyMult_signature, F_R) \
+  do_name(intPolyMult_name, "mult")                                                                                     \
+  do_signature(intPolyMult_signature, "([J[J[J)I")                                                                      \
+                                                                                                                        \
+  do_class(sun_security_util_math_intpoly_IntegerPolynomial, "sun/security/util/math/intpoly/IntegerPolynomial")        \
+  do_intrinsic(_intpoly_assign, sun_security_util_math_intpoly_IntegerPolynomial, intPolyAssign_name, intPolyAssign_signature, F_S) \
+   do_name(intPolyAssign_name, "conditionalAssign")                                                                     \
+   do_signature(intPolyAssign_signature, "(I[J[J)V")                                                                    \
+                                                                                                                        \
+  /* support for java.util.Base64.Encoder*/                                                                             \
   do_class(java_util_Base64_Encoder, "java/util/Base64$Encoder")                                                        \
   do_intrinsic(_base64_encodeBlock, java_util_Base64_Encoder, encodeBlock_name, encodeBlock_signature, F_R)             \
   do_name(encodeBlock_name, "encodeBlock")                                                                              \
diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
index 73eca19f086..20583ce492d 100644
--- a/src/hotspot/share/code/codeCache.cpp
+++ b/src/hotspot/share/code/codeCache.cpp
@@ -34,7 +34,6 @@
 #include "compiler/compilationPolicy.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/compilerDefinitions.inline.hpp"
-#include "compiler/compilerDirectives.hpp"
 #include "compiler/oopMap.hpp"
 #include "gc/shared/barrierSetNMethod.hpp"
 #include "gc/shared/classUnloadingContext.hpp"
@@ -1330,67 +1329,6 @@ void CodeCache::mark_all_nmethods_for_evol_deoptimization(DeoptimizationScope* d
 
 #endif // INCLUDE_JVMTI
 
-void CodeCache::mark_directives_matches(bool top_only) {
-  MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
-  Thread *thread = Thread::current();
-  HandleMark hm(thread);
-
-  NMethodIterator iter(NMethodIterator::not_unloading);
-  while(iter.next()) {
-    nmethod* nm = iter.method();
-    methodHandle mh(thread, nm->method());
-    if (DirectivesStack::hasMatchingDirectives(mh, top_only)) {
-      ResourceMark rm;
-      log_trace(codecache)("Mark because of matching directives %s", mh->external_name());
-      mh->set_has_matching_directives();
-    }
-  }
-}
-
-void CodeCache::recompile_marked_directives_matches() {
-  Thread *thread = Thread::current();
-  HandleMark hm(thread);
-
-  // Try the max level and let the directives be applied during the compilation.
-  int comp_level = CompilationPolicy::highest_compile_level();
-  RelaxedNMethodIterator iter(RelaxedNMethodIterator::not_unloading);
-  while(iter.next()) {
-    nmethod* nm = iter.method();
-    methodHandle mh(thread, nm->method());
-    if (mh->has_matching_directives()) {
-      ResourceMark rm;
-      mh->clear_directive_flags();
-      bool deopt = false;
-
-      if (!nm->is_osr_method()) {
-        log_trace(codecache)("Recompile to level %d because of matching directives %s",
-                             comp_level, mh->external_name());
-        nmethod * comp_nm = CompileBroker::compile_method(mh, InvocationEntryBci, comp_level,
-                                                          methodHandle(), 0,
-                                                          CompileTask::Reason_DirectivesChanged,
-                                                          (JavaThread*)thread);
-        if (comp_nm == nullptr) {
-          log_trace(codecache)("Recompilation to level %d failed, deoptimize %s",
-                               comp_level, mh->external_name());
-          deopt = true;
-        }
-      } else {
-        log_trace(codecache)("Deoptimize OSR %s", mh->external_name());
-        deopt = true;
-      }
-      // For some reason the method cannot be compiled by C2, e.g. the new directives forbid it.
-      // Deoptimize the method and let the usual hotspot logic do the rest.
-      if (deopt) {
-        if (!nm->has_been_deoptimized() && nm->can_be_deoptimized()) {
-          nm->make_not_entrant();
-          nm->make_deoptimized();
-        }
-      }
-      gc_on_allocation(); // Flush unused methods from CodeCache if required.
-    }
-  }
-}
-
 // Mark methods for deopt (if safe or possible).
 void CodeCache::mark_all_nmethods_for_deoptimization(DeoptimizationScope* deopt_scope) {
   MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
diff --git a/src/hotspot/share/code/codeCache.hpp b/src/hotspot/share/code/codeCache.hpp
index 7d8835abd11..8fcbf32b644 100644
--- a/src/hotspot/share/code/codeCache.hpp
+++ b/src/hotspot/share/code/codeCache.hpp
@@ -295,9 +295,6 @@ class CodeCache : AllStatic {
   static void mark_for_deoptimization(DeoptimizationScope* deopt_scope, Method* dependee);
   static void make_marked_nmethods_deoptimized();
 
-  static void mark_directives_matches(bool top_only = false);
-  static void recompile_marked_directives_matches();
-
   // Marks dependents during classloading
   static void mark_dependents_on(DeoptimizationScope* deopt_scope, InstanceKlass* dependee);
 
diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index ddd5b2f0eb7..45b0b331e25 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -1172,13 +1172,11 @@ void CompileBroker::compile_method_base(const methodHandle& method,
     tty->cr();
   }
 
-  if (compile_reason != CompileTask::Reason_DirectivesChanged) {
-    // A request has been made for compilation.  Before we do any
-    // real work, check to see if the method has been compiled
-    // in the meantime with a definitive result.
-    if (compilation_is_complete(method, osr_bci, comp_level)) {
-      return;
-    }
+  // A request has been made for compilation.  Before we do any
+  // real work, check to see if the method has been compiled
+  // in the meantime with a definitive result.
+  if (compilation_is_complete(method, osr_bci, comp_level)) {
+    return;
   }
 
 #ifndef PRODUCT
@@ -1223,13 +1221,11 @@ void CompileBroker::compile_method_base(const methodHandle& method,
       return;
     }
 
-    if (compile_reason != CompileTask::Reason_DirectivesChanged) {
-      // We need to check again to see if the compilation has
-      // completed.  A previous compilation may have registered
-      // some result.
-      if (compilation_is_complete(method, osr_bci, comp_level)) {
-        return;
-      }
+    // We need to check again to see if the compilation has
+    // completed.  A previous compilation may have registered
+    // some result.
+    if (compilation_is_complete(method, osr_bci, comp_level)) {
+      return;
     }
 
     // We now know that this compilation is not pending, complete,
@@ -1378,7 +1374,7 @@ nmethod* CompileBroker::compile_method(const methodHandle& method, int osr_bci,
   if (osr_bci == InvocationEntryBci) {
     // standard compilation
     nmethod* method_code = method->code();
-    if (method_code != nullptr && (compile_reason != CompileTask::Reason_DirectivesChanged)) {
+    if (method_code != nullptr) {
       if (compilation_is_complete(method, osr_bci, comp_level)) {
         return method_code;
       }
diff --git a/src/hotspot/share/compiler/compileTask.hpp b/src/hotspot/share/compiler/compileTask.hpp
index 137e9843c35..37459bd0ff5 100644
--- a/src/hotspot/share/compiler/compileTask.hpp
+++ b/src/hotspot/share/compiler/compileTask.hpp
@@ -62,7 +62,6 @@ class CompileTask : public CHeapObj<mtCompiler> {
       Reason_Whitebox,         // Whitebox API
       Reason_MustBeCompiled,   // Used for -Xcomp or AlwaysCompileLoopMethods (see CompilationPolicy::must_be_compiled())
       Reason_Bootstrap,        // JVMCI bootstrap
-      Reason_DirectivesChanged, // Changed CompilerDirectivesStack
       Reason_Count
   };
 
@@ -75,8 +74,7 @@ class CompileTask : public CHeapObj<mtCompiler> {
       "replay",
       "whitebox",
       "must_be_compiled",
-      "bootstrap",
-      "directives_changed"
+      "bootstrap"
     };
     return reason_names[compile_reason];
   }
diff --git a/src/hotspot/share/compiler/compilerDirectives.cpp b/src/hotspot/share/compiler/compilerDirectives.cpp
index f5ccd9e69e9..b48eb4fb817 100644
--- a/src/hotspot/share/compiler/compilerDirectives.cpp
+++ b/src/hotspot/share/compiler/compilerDirectives.cpp
@@ -747,25 +747,6 @@ void DirectivesStack::release(CompilerDirectives* dir) {
   }
 }
 
-bool DirectivesStack::hasMatchingDirectives(const methodHandle& method, bool top_only) {
-  assert(_depth > 0, "Must never be empty");
-  MutexLocker locker(DirectivesStack_lock, Mutex::_no_safepoint_check_flag);
-
-  CompilerDirectives* dir = _top;
-  assert(dir != nullptr, "Must be initialized");
-
-  while (dir != nullptr) {
-    if (!dir->is_default_directive() && dir->match(method)) {
-      return true;
-    }
-    if (top_only) {
-      break;
-    }
-    dir = dir->next();
-  }
-  return false;
-}
-
 DirectiveSet* DirectivesStack::getMatchingDirective(const methodHandle& method, AbstractCompiler *comp) {
   assert(_depth > 0, "Must never be empty");
 
diff --git a/src/hotspot/share/compiler/compilerDirectives.hpp b/src/hotspot/share/compiler/compilerDirectives.hpp
index 0b1090406b9..bf15fe9c713 100644
--- a/src/hotspot/share/compiler/compilerDirectives.hpp
+++ b/src/hotspot/share/compiler/compilerDirectives.hpp
@@ -114,7 +114,6 @@ class DirectivesStack : AllStatic {
 public:
   static void init();
   static DirectiveSet* getMatchingDirective(const methodHandle& mh, AbstractCompiler* comp);
-  static bool hasMatchingDirectives(const methodHandle& method, bool top_only = false);
   static DirectiveSet* getDefaultDirective(AbstractCompiler* comp);
   static void push(CompilerDirectives* directive);
   static void pop(int count);
diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
index b875f2f5c6d..7e6b0e56d93 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
@@ -62,7 +62,8 @@ inline uint8_t* G1BlockOffsetTable::entry_for_addr(const void* const p) const {
 }
 
 inline HeapWord* G1BlockOffsetTable::addr_for_entry(const uint8_t* const p) const {
-  size_t delta = pointer_delta(p, _offset_base, sizeof(uint8_t));
+  // _offset_base can be "negative", so can't use pointer_delta().
+  size_t delta = p - _offset_base;
   HeapWord* result = (HeapWord*) (delta << CardTable::card_shift());
   assert(_reserved.contains(result),
          "out of bounds accessor from block offset table");
diff --git a/src/hotspot/share/gc/g1/g1CardSet.cpp b/src/hotspot/share/gc/g1/g1CardSet.cpp
index 101822dbc44..3202859907c 100644
--- a/src/hotspot/share/gc/g1/g1CardSet.cpp
+++ b/src/hotspot/share/gc/g1/g1CardSet.cpp
@@ -533,7 +533,7 @@ G1AddCardResult G1CardSet::add_to_howl(ContainerPtr parent_container,
   ContainerPtr container;
 
   uint bucket = _config->howl_bucket_index(card_in_region);
-  ContainerPtr volatile* bucket_entry = howl->get_container_addr(bucket);
+  ContainerPtr volatile* bucket_entry = howl->container_addr(bucket);
 
   while (true) {
     if (Atomic::load(&howl->_num_entries) >= _config->cards_in_howl_threshold()) {
diff --git a/src/hotspot/share/gc/g1/g1CardSetContainers.hpp b/src/hotspot/share/gc/g1/g1CardSetContainers.hpp
index 16ec6b59a6d..261b7e5b20a 100644
--- a/src/hotspot/share/gc/g1/g1CardSetContainers.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSetContainers.hpp
@@ -238,23 +238,27 @@ class G1CardSetHowl : public G1CardSetContainer {
   using ContainerPtr = G1CardSet::ContainerPtr;
   EntryCountType volatile _num_entries;
 private:
-  ContainerPtr _buckets[2];
-  // Do not add class member variables beyond this point
+  // VLA implementation.
+  ContainerPtr _buckets[1];
+  // Do not add class member variables beyond this point.
 
   // Iterates over the given ContainerPtr with at index in this Howl card set,
   // applying a CardOrRangeVisitor on it.
   template <class CardOrRangeVisitor>
   void iterate_cardset(ContainerPtr const container, uint index, CardOrRangeVisitor& found, G1CardSetConfiguration* config);
 
+  ContainerPtr at(EntryCountType index) const;
+
+  ContainerPtr const* buckets() const;
+
 public:
   G1CardSetHowl(EntryCountType card_in_region, G1CardSetConfiguration* config);
 
-  ContainerPtr* get_container_addr(EntryCountType index) {
-    return &_buckets[index];
-  }
+  ContainerPtr const* container_addr(EntryCountType index) const;
 
-  bool contains(uint card_idx, G1CardSetConfiguration* config);
+  ContainerPtr* container_addr(EntryCountType index);
 
+  bool contains(uint card_idx, G1CardSetConfiguration* config);
   // Iterates over all ContainerPtrs in this Howl card set, applying a CardOrRangeVisitor
   // on it.
   template <class CardOrRangeVisitor>
diff --git a/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp b/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
index 35abc092306..330e9d63600 100644
--- a/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
@@ -257,15 +257,33 @@ inline size_t G1CardSetBitMap::header_size_in_bytes() {
     return offset_of(G1CardSetBitMap, _bits);
 }
 
+inline G1CardSetHowl::ContainerPtr const* G1CardSetHowl::container_addr(EntryCountType index) const {
+  assert(index < _num_entries, "precondition");
+  return buckets() + index;
+}
+
+inline G1CardSetHowl::ContainerPtr* G1CardSetHowl::container_addr(EntryCountType index) {
+  return const_cast<ContainerPtr*>(const_cast<const G1CardSetHowl*>(this)->container_addr(index));
+}
+
+inline G1CardSetHowl::ContainerPtr G1CardSetHowl::at(EntryCountType index) const {
+  return *container_addr(index);
+}
+
+inline G1CardSetHowl::ContainerPtr const* G1CardSetHowl::buckets() const {
+  const void* ptr = reinterpret_cast<const char*>(this) + header_size_in_bytes();
+  return reinterpret_cast<ContainerPtr const*>(ptr);
+}
+
 inline G1CardSetHowl::G1CardSetHowl(EntryCountType card_in_region, G1CardSetConfiguration* config) :
   G1CardSetContainer(),
   _num_entries((config->max_cards_in_array() + 1)) /* Card Transfer will not increment _num_entries */ {
   EntryCountType num_buckets = config->num_buckets_in_howl();
   EntryCountType bucket = config->howl_bucket_index(card_in_region);
   for (uint i = 0; i < num_buckets; ++i) {
-    _buckets[i] = G1CardSetInlinePtr();
+    *container_addr(i) = G1CardSetInlinePtr();
     if (i == bucket) {
-      G1CardSetInlinePtr value(&_buckets[i], _buckets[i]);
+      G1CardSetInlinePtr value(container_addr(i), at(i));
       value.add(card_in_region, config->inline_ptr_bits_per_card(), config->max_cards_in_inline_ptr());
     }
   }
@@ -273,7 +291,7 @@ inline G1CardSetHowl::G1CardSetHowl(EntryCountType card_in_region, G1CardSetConf
 
 inline bool G1CardSetHowl::contains(uint card_idx, G1CardSetConfiguration* config) {
   EntryCountType bucket = config->howl_bucket_index(card_idx);
-  ContainerPtr* array_entry = get_container_addr(bucket);
+  ContainerPtr* array_entry = container_addr(bucket);
   ContainerPtr container = Atomic::load_acquire(array_entry);
 
   switch (G1CardSet::container_type(container)) {
@@ -299,14 +317,14 @@ inline bool G1CardSetHowl::contains(uint card_idx, G1CardSetConfiguration* confi
 template <class CardOrRangeVisitor>
 inline void G1CardSetHowl::iterate(CardOrRangeVisitor& found, G1CardSetConfiguration* config) {
   for (uint i = 0; i < config->num_buckets_in_howl(); ++i) {
-    iterate_cardset(_buckets[i], i, found, config);
+    iterate_cardset(at(i), i, found, config);
   }
 }
 
 template <class ContainerPtrVisitor>
 inline void G1CardSetHowl::iterate(ContainerPtrVisitor& found, uint num_card_sets) {
   for (uint i = 0; i < num_card_sets; ++i) {
-    found(&_buckets[i]);
+    found(container_addr(i));
   }
 }
 
diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
index b4ea1955182..d6a6639d7ef 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
@@ -83,18 +83,7 @@ void MutableNUMASpace::mangle_unused_area() {
 void MutableNUMASpace::mangle_region(MemRegion mr) {
   // This method should do nothing because numa spaces are not mangled.
 }
-void MutableNUMASpace::set_top_for_allocations(HeapWord* v) {
-  assert(false, "Do not mangle MutableNUMASpace's");
-}
-void MutableNUMASpace::set_top_for_allocations() {
-  // This method should do nothing.
-}
-void MutableNUMASpace::check_mangled_unused_area(HeapWord* limit) {
-  // This method should do nothing.
-}
-void MutableNUMASpace::check_mangled_unused_area_complete() {
-  // This method should do nothing.
-}
+
 #endif  // NOT_PRODUCT
 
 // There may be unallocated holes in the middle chunks
diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
index 9a6cf420c0d..76653f6c5e6 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
@@ -175,10 +175,6 @@ class MutableNUMASpace : public MutableSpace {
   virtual void mangle_unused_area() PRODUCT_RETURN;
 
   virtual void mangle_region(MemRegion mr) PRODUCT_RETURN;
-  virtual void check_mangled_unused_area(HeapWord* limit) PRODUCT_RETURN;
-  virtual void check_mangled_unused_area_complete() PRODUCT_RETURN;
-  virtual void set_top_for_allocations(HeapWord* v) PRODUCT_RETURN;
-  virtual void set_top_for_allocations() PRODUCT_RETURN;
 
   virtual void ensure_parsability();
   virtual size_t used_in_words() const;
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.cpp b/src/hotspot/share/gc/parallel/mutableSpace.cpp
index 7d881f73dbf..7e1115e2b41 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.cpp
@@ -25,7 +25,6 @@
 #include "precompiled.hpp"
 #include "gc/parallel/mutableSpace.hpp"
 #include "gc/shared/pretouchTask.hpp"
-#include "gc/shared/spaceDecorator.inline.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
@@ -36,7 +35,6 @@
 #include "utilities/macros.hpp"
 
 MutableSpace::MutableSpace(size_t alignment) :
-  _mangler(nullptr),
   _last_setup_region(),
   _alignment(alignment),
   _bottom(nullptr),
@@ -45,11 +43,6 @@ MutableSpace::MutableSpace(size_t alignment) :
 {
   assert(MutableSpace::alignment() % os::vm_page_size() == 0,
          "Space should be aligned");
-  _mangler = new MutableSpaceMangler(this);
-}
-
-MutableSpace::~MutableSpace() {
-  delete _mangler;
 }
 
 void MutableSpace::numa_setup_pages(MemRegion mr, size_t page_size, bool clear_space) {
@@ -152,32 +145,15 @@ void MutableSpace::clear(bool mangle_space) {
 }
 
 #ifndef PRODUCT
-void MutableSpace::check_mangled_unused_area(HeapWord* limit) {
-  mangler()->check_mangled_unused_area(limit);
-}
-
-void MutableSpace::check_mangled_unused_area_complete() {
-  mangler()->check_mangled_unused_area_complete();
-}
 
-// Mangle only the unused space that has not previously
-// been mangled and that has not been allocated since being
-// mangled.
 void MutableSpace::mangle_unused_area() {
-  mangler()->mangle_unused_area();
+  mangle_region(MemRegion(_top, _end));
 }
 
 void MutableSpace::mangle_region(MemRegion mr) {
   SpaceMangler::mangle_region(mr);
 }
 
-void MutableSpace::set_top_for_allocations(HeapWord* v) {
-  mangler()->set_top_for_allocations(v);
-}
-
-void MutableSpace::set_top_for_allocations() {
-  mangler()->set_top_for_allocations(top());
-}
 #endif
 
 HeapWord* MutableSpace::cas_allocate(size_t size) {
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.hpp b/src/hotspot/share/gc/parallel/mutableSpace.hpp
index 1cf0d306dc0..1add9c7735a 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.hpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.hpp
@@ -46,13 +46,9 @@ class WorkerThreads;
 // Invariant: bottom() <= top() <= end()
 // top() and end() are exclusive.
 
-class MutableSpaceMangler;
-
 class MutableSpace: public CHeapObj<mtGC> {
   friend class VMStructs;
 
-  // Helper for mangling unused space in debug builds
-  MutableSpaceMangler* _mangler;
   // The last region which page had been setup to be interleaved.
   MemRegion _last_setup_region;
   size_t _alignment;
@@ -60,15 +56,13 @@ class MutableSpace: public CHeapObj<mtGC> {
   HeapWord* volatile _top;
   HeapWord* _end;
 
-  MutableSpaceMangler* mangler() { return _mangler; }
-
   void numa_setup_pages(MemRegion mr, size_t page_size, bool clear_space);
 
   void set_last_setup_region(MemRegion mr) { _last_setup_region = mr;   }
   MemRegion last_setup_region() const      { return _last_setup_region; }
 
  public:
-  virtual ~MutableSpace();
+  virtual ~MutableSpace() = default;
   MutableSpace(size_t page_size);
 
   // Accessors
@@ -107,20 +101,11 @@ class MutableSpace: public CHeapObj<mtGC> {
   virtual void update() { }
   virtual void accumulate_statistics() { }
 
-  // Methods used in mangling.  See descriptions under SpaceMangler.
   virtual void mangle_unused_area() PRODUCT_RETURN;
-
-  virtual void check_mangled_unused_area(HeapWord* limit) PRODUCT_RETURN;
-  virtual void check_mangled_unused_area_complete() PRODUCT_RETURN;
-  virtual void set_top_for_allocations(HeapWord* v) PRODUCT_RETURN;
-
-  // Used to save the space's current top for later use during mangling.
-  virtual void set_top_for_allocations() PRODUCT_RETURN;
+  virtual void mangle_region(MemRegion mr) PRODUCT_RETURN;
 
   virtual void ensure_parsability() { }
 
-  virtual void mangle_region(MemRegion mr) PRODUCT_RETURN;
-
   // Boolean queries.
   bool is_empty() const              { return used_in_words() == 0; }
   bool not_empty() const             { return used_in_words() > 0; }
diff --git a/src/hotspot/share/gc/parallel/objectStartArray.hpp b/src/hotspot/share/gc/parallel/objectStartArray.hpp
index dec703cbb19..aadf2651f2c 100644
--- a/src/hotspot/share/gc/parallel/objectStartArray.hpp
+++ b/src/hotspot/share/gc/parallel/objectStartArray.hpp
@@ -57,7 +57,8 @@ class ObjectStartArray : public CHeapObj<mtGC> {
 
   // Mapping from object start array entry to address of first word
   HeapWord* addr_for_entry(const uint8_t* const p) const {
-    size_t delta = pointer_delta(p, _offset_base, sizeof(uint8_t));
+    // _offset_base can be "negative", so can't use pointer_delta().
+    size_t delta = p - _offset_base;
     HeapWord* result = (HeapWord*) (delta << CardTable::card_shift());
     assert(_covered_region.contains(result),
            "out of bounds accessor from card marking array");
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index 318b5b5e137..2984cedafe1 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -841,24 +841,6 @@ void ParallelScavengeHeap::complete_loaded_archive_space(MemRegion archive_space
   _old_gen->complete_loaded_archive_space(archive_space);
 }
 
-#ifndef PRODUCT
-void ParallelScavengeHeap::record_gen_tops_before_GC() {
-  if (ZapUnusedHeapArea) {
-    young_gen()->record_spaces_top();
-    old_gen()->record_spaces_top();
-  }
-}
-
-void ParallelScavengeHeap::gen_mangle_unused_area() {
-  if (ZapUnusedHeapArea) {
-    young_gen()->eden_space()->mangle_unused_area();
-    young_gen()->to_space()->mangle_unused_area();
-    young_gen()->from_space()->mangle_unused_area();
-    old_gen()->object_space()->mangle_unused_area();
-  }
-}
-#endif
-
 void ParallelScavengeHeap::register_nmethod(nmethod* nm) {
   ScavengableNMethods::register_nmethod(nm);
 }
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
index 38a1f2acc4b..fa45abc80b4 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
@@ -243,12 +243,6 @@ class ParallelScavengeHeap : public CollectedHeap {
   // generation may be expanded in preparation for the resize.
   void resize_old_gen(size_t desired_free_space);
 
-  // Save the tops of the spaces in all generations
-  void record_gen_tops_before_GC() PRODUCT_RETURN;
-
-  // Mangle the unused parts of all spaces in the heap
-  void gen_mangle_unused_area() PRODUCT_RETURN;
-
   GCMemoryManager* old_gc_manager() const { return _old_manager; }
   GCMemoryManager* young_gc_manager() const { return _young_manager; }
 
diff --git a/src/hotspot/share/gc/parallel/psOldGen.cpp b/src/hotspot/share/gc/parallel/psOldGen.cpp
index 9899b89ad29..4744811b425 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.cpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.cpp
@@ -31,7 +31,6 @@
 #include "gc/parallel/psOldGen.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/gcLocker.hpp"
-#include "gc/shared/spaceDecorator.inline.hpp"
 #include "logging/log.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/java.hpp"
@@ -376,10 +375,3 @@ void PSOldGen::update_counters() {
 void PSOldGen::verify() {
   object_space()->verify();
 }
-
-#ifndef PRODUCT
-void PSOldGen::record_spaces_top() {
-  assert(ZapUnusedHeapArea, "Not mangling unused space");
-  object_space()->set_top_for_allocations();
-}
-#endif
diff --git a/src/hotspot/share/gc/parallel/psOldGen.hpp b/src/hotspot/share/gc/parallel/psOldGen.hpp
index 6eb5e01bc8a..35cefec8a0a 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.hpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.hpp
@@ -156,9 +156,6 @@ class PSOldGen : public CHeapObj<mtGC> {
   // Printing support
   const char* name() const { return "ParOldGen"; }
 
-  // Debugging support
-  // Save the tops of all spaces for later use during mangling.
-  void record_spaces_top() PRODUCT_RETURN;
 };
 
 #endif // SHARE_GC_PARALLEL_PSOLDGEN_HPP
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index b85457c0156..994bdc847cf 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -57,7 +57,6 @@
 #include "gc/shared/referencePolicy.hpp"
 #include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/referenceProcessorPhaseTimes.hpp"
-#include "gc/shared/spaceDecorator.inline.hpp"
 #include "gc/shared/strongRootsScope.hpp"
 #include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/weakProcessor.inline.hpp"
@@ -963,8 +962,16 @@ void PSParallelCompact::post_compact()
   for (unsigned int id = old_space_id; id < last_space_id; ++id) {
     // Clear the marking bitmap, summary data and split info.
     clear_data_covering_space(SpaceId(id));
-    // Update top().  Must be done after clearing the bitmap and summary data.
-    _space_info[id].publish_new_top();
+    {
+      MutableSpace* space = _space_info[id].space();
+      HeapWord* top = space->top();
+      HeapWord* new_top = _space_info[id].new_top();
+      if (ZapUnusedHeapArea && new_top < top) {
+        space->mangle_region(MemRegion(new_top, top));
+      }
+      // Update top().  Must be done after clearing the bitmap and summary data.
+      space->set_top(new_top);
+    }
   }
 
   ParCompactionManager::flush_all_string_dedup_requests();
@@ -1007,10 +1014,6 @@ void PSParallelCompact::post_compact()
   DerivedPointerTable::update_pointers();
 #endif
 
-  if (ZapUnusedHeapArea) {
-    heap->gen_mangle_unused_area();
-  }
-
   // Signal that we have completed a visit to all live objects.
   Universe::heap()->record_whole_heap_examined_timestamp();
 }
@@ -1307,11 +1310,6 @@ bool PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
   ClearedAllSoftRefs casr(maximum_heap_compaction,
                           heap->soft_ref_policy());
 
-  if (ZapUnusedHeapArea) {
-    // Save information needed to minimize mangling
-    heap->record_gen_tops_before_GC();
-  }
-
   // Make sure data structures are sane, make the heap parsable, and do other
   // miscellaneous bookkeeping.
   pre_compact();
@@ -1469,10 +1467,6 @@ bool PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
     Universe::verify("After GC");
   }
 
-  if (ZapUnusedHeapArea) {
-    old_gen->object_space()->check_mangled_unused_area_complete();
-  }
-
   heap->print_heap_after_gc();
   heap->trace_heap_after_gc(&_gc_tracer);
 
diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp
index 3e90529a534..865bbd17099 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp
@@ -50,7 +50,6 @@
 #include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/referenceProcessorPhaseTimes.hpp"
 #include "gc/shared/scavengableNMethods.hpp"
-#include "gc/shared/spaceDecorator.inline.hpp"
 #include "gc/shared/strongRootsScope.hpp"
 #include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/weakProcessor.inline.hpp"
diff --git a/src/hotspot/share/gc/parallel/psYoungGen.cpp b/src/hotspot/share/gc/parallel/psYoungGen.cpp
index 12a6da8c2c4..7b0d3b21507 100644
--- a/src/hotspot/share/gc/parallel/psYoungGen.cpp
+++ b/src/hotspot/share/gc/parallel/psYoungGen.cpp
@@ -29,7 +29,6 @@
 #include "gc/parallel/psYoungGen.hpp"
 #include "gc/shared/gcUtil.hpp"
 #include "gc/shared/genArguments.hpp"
-#include "gc/shared/spaceDecorator.inline.hpp"
 #include "logging/log.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/java.hpp"
@@ -622,20 +621,6 @@ void PSYoungGen::resize_spaces(size_t requested_eden_size,
         mangle_survivors(to_space(), toMR, from_space(), fromMR);
       }
     }
-
-    // If not mangling the spaces, do some checking to verify that
-    // the spaces are already mangled.
-    // The spaces should be correctly mangled at this point so
-    // do some checking here. Note that they are not being mangled
-    // in the calls to initialize().
-    // Must check mangling before the spaces are reshaped.  Otherwise,
-    // the bottom or end of one space may have moved into an area
-    // covered by another space and a failure of the check may
-    // not correctly indicate which space is not properly mangled.
-    HeapWord* limit = (HeapWord*) virtual_space()->high();
-    eden_space()->check_mangled_unused_area(limit);
-    from_space()->check_mangled_unused_area(limit);
-      to_space()->check_mangled_unused_area(limit);
   }
 
   WorkerThreads* workers = &ParallelScavengeHeap::heap()->workers();
@@ -833,12 +818,3 @@ void PSYoungGen::verify() {
   from_space()->verify();
   to_space()->verify();
 }
-
-#ifndef PRODUCT
-void PSYoungGen::record_spaces_top() {
-  assert(ZapUnusedHeapArea, "Not mangling unused space");
-  eden_space()->set_top_for_allocations();
-  from_space()->set_top_for_allocations();
-  to_space()->set_top_for_allocations();
-}
-#endif
diff --git a/src/hotspot/share/gc/parallel/psYoungGen.hpp b/src/hotspot/share/gc/parallel/psYoungGen.hpp
index fb0bf6cd43e..6e256e81d97 100644
--- a/src/hotspot/share/gc/parallel/psYoungGen.hpp
+++ b/src/hotspot/share/gc/parallel/psYoungGen.hpp
@@ -152,8 +152,6 @@ class PSYoungGen : public CHeapObj<mtGC> {
                         MemRegion s1MR,
                         MutableSpace* s2,
                         MemRegion s2MR) PRODUCT_RETURN;
-
-  void record_spaces_top() PRODUCT_RETURN;
 };
 
 #endif // SHARE_GC_PARALLEL_PSYOUNGGEN_HPP
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index ff65a6dd450..be104dce571 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -43,7 +43,7 @@
 #include "gc/shared/referencePolicy.hpp"
 #include "gc/shared/referenceProcessorPhaseTimes.hpp"
 #include "gc/shared/space.hpp"
-#include "gc/shared/spaceDecorator.inline.hpp"
+#include "gc/shared/spaceDecorator.hpp"
 #include "gc/shared/strongRootsScope.hpp"
 #include "gc/shared/weakProcessor.hpp"
 #include "logging/log.hpp"
@@ -331,21 +331,6 @@ void DefNewGeneration::compute_space_boundaries(uintx minimum_eden_size,
   // newly formed eden.
   bool live_in_eden = minimum_eden_size > 0;
 
-  // If not clearing the spaces, do some checking to verify that
-  // the space are already mangled.
-  if (!clear_space) {
-    // Must check mangling before the spaces are reshaped.  Otherwise,
-    // the bottom or end of one space may have moved into another
-    // a failure of the check may not correctly indicate which space
-    // is not properly mangled.
-    if (ZapUnusedHeapArea) {
-      HeapWord* limit = (HeapWord*) _virtual_space.high();
-      eden()->check_mangled_unused_area(limit);
-      from()->check_mangled_unused_area(limit);
-        to()->check_mangled_unused_area(limit);
-    }
-  }
-
   // Reset the spaces for their new regions.
   eden()->initialize(edenMR,
                      clear_space && !live_in_eden,
@@ -641,22 +626,9 @@ void DefNewGeneration::adjust_desired_tenuring_threshold() {
   age_table()->print_age_table();
 }
 
-void DefNewGeneration::collect(bool   full,
-                               bool   clear_all_soft_refs,
-                               size_t size,
-                               bool   is_tlab) {
-  assert(full || size > 0, "otherwise we don't want to collect");
-
+bool DefNewGeneration::collect(bool clear_all_soft_refs) {
   SerialHeap* heap = SerialHeap::heap();
 
-  // If the next generation is too full to accommodate promotion
-  // from this generation, pass on collection; let the next generation
-  // do it.
-  if (!collection_attempt_is_safe()) {
-    log_trace(gc)(":: Collection attempt not safe ::");
-    heap->set_incremental_collection_failed(); // Slight lie: we did not even attempt one
-    return;
-  }
   assert(to()->is_empty(), "Else not collection_attempt_is_safe");
   _gc_timer->register_gc_start();
   _gc_tracer->report_gc_start(heap->gc_cause(), _gc_timer->gc_start());
@@ -730,16 +702,6 @@ void DefNewGeneration::collect(bool   full,
     // Swap the survivor spaces.
     eden()->clear(SpaceDecorator::Mangle);
     from()->clear(SpaceDecorator::Mangle);
-    if (ZapUnusedHeapArea) {
-      // This is now done here because of the piece-meal mangling which
-      // can check for valid mangling at intermediate points in the
-      // collection(s).  When a young collection fails to collect
-      // sufficient space resizing of the young generation can occur
-      // an redistribute the spaces in the young generation.  Mangle
-      // here so that unzapped regions don't get distributed to
-      // other spaces.
-      to()->mangle_unused_area();
-    }
     swap_spaces();
 
     assert(to()->is_empty(), "to space should be empty now");
@@ -774,6 +736,8 @@ void DefNewGeneration::collect(bool   full,
   _gc_timer->register_gc_end();
 
   _gc_tracer->report_gc_end(_gc_timer->gc_end(), _gc_timer->time_partitions());
+
+  return !_promotion_failed;
 }
 
 void DefNewGeneration::init_assuming_no_promotion_failure() {
@@ -903,7 +867,7 @@ void DefNewGeneration::reset_scratch() {
   // to_space if ZapUnusedHeapArea.  This is needed because
   // top is not maintained while using to-space as scratch.
   if (ZapUnusedHeapArea) {
-    to()->mangle_unused_area_complete();
+    to()->mangle_unused_area();
   }
 }
 
@@ -961,24 +925,11 @@ void DefNewGeneration::gc_epilogue(bool full) {
 #endif // ASSERT
   }
 
-  if (ZapUnusedHeapArea) {
-    eden()->check_mangled_unused_area_complete();
-    from()->check_mangled_unused_area_complete();
-    to()->check_mangled_unused_area_complete();
-  }
-
   // update the generation and space performance counters
   update_counters();
   gch->counters()->update_counters();
 }
 
-void DefNewGeneration::record_spaces_top() {
-  assert(ZapUnusedHeapArea, "Not mangling unused space");
-  eden()->set_top_for_allocations();
-  to()->set_top_for_allocations();
-  from()->set_top_for_allocations();
-}
-
 void DefNewGeneration::update_counters() {
   if (UsePerfData) {
     _eden_counters->update_all();
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.hpp b/src/hotspot/share/gc/serial/defNewGeneration.hpp
index 2feb92505e6..65ee52cf4ea 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.hpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.hpp
@@ -208,19 +208,18 @@ class DefNewGeneration: public Generation {
   HeapWord* block_start(const void* p) const;
 
   // Allocation support
-  virtual bool should_allocate(size_t word_size, bool is_tlab) {
+  bool should_allocate(size_t word_size, bool is_tlab) {
     assert(UseTLAB || !is_tlab, "Should not allocate tlab");
+    assert(word_size != 0, "precondition");
 
     size_t overflow_limit    = (size_t)1 << (BitsPerSize_t - LogHeapWordSize);
 
-    const bool non_zero      = word_size > 0;
     const bool overflows     = word_size >= overflow_limit;
     const bool check_too_big = _pretenure_size_threshold_words > 0;
     const bool not_too_big   = word_size < _pretenure_size_threshold_words;
     const bool size_ok       = is_tlab || !check_too_big || not_too_big;
 
     bool result = !overflows &&
-                  non_zero   &&
                   size_ok;
 
     return result;
@@ -233,9 +232,6 @@ class DefNewGeneration: public Generation {
 
   void gc_epilogue(bool full);
 
-  // Save the tops for eden, from, and to
-  void record_spaces_top();
-
   // For Old collection (part of running Full GC), the DefNewGeneration can
   // contribute the free part of "to-space" as the scratch space.
   void contribute_scratch(void*& scratch, size_t& num_words);
@@ -253,10 +249,7 @@ class DefNewGeneration: public Generation {
   // at some additional cost.
   bool collection_attempt_is_safe();
 
-  virtual void collect(bool   full,
-                       bool   clear_all_soft_refs,
-                       size_t size,
-                       bool   is_tlab);
+  bool collect(bool clear_all_soft_refs);
 
   HeapWord* expand_and_allocate(size_t size, bool is_tlab);
 
diff --git a/src/hotspot/share/gc/serial/generation.cpp b/src/hotspot/share/gc/serial/generation.cpp
index 02edd8ae0a1..5d3b7fe2fe3 100644
--- a/src/hotspot/share/gc/serial/generation.cpp
+++ b/src/hotspot/share/gc/serial/generation.cpp
@@ -31,7 +31,7 @@
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTrace.hpp"
 #include "gc/shared/space.hpp"
-#include "gc/shared/spaceDecorator.inline.hpp"
+#include "gc/shared/spaceDecorator.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"
@@ -70,14 +70,3 @@ void Generation::print_on(outputStream* st)  const {
               p2i(_virtual_space.high()),
               p2i(_virtual_space.high_boundary()));
 }
-
-void Generation::print_summary_info_on(outputStream* st) {
-  StatRecord* sr = stat_record();
-  double time = sr->accumulated_time.seconds();
-  st->print_cr("Accumulated %s generation GC time %3.7f secs, "
-               "%u GC's, avg GC time %3.7f",
-               SerialHeap::heap()->is_young_gen(this) ? "young" : "old" ,
-               time,
-               sr->invocations,
-               sr->invocations > 0 ? time / sr->invocations : 0.0);
-}
diff --git a/src/hotspot/share/gc/serial/generation.hpp b/src/hotspot/share/gc/serial/generation.hpp
index 50531705dd3..9f73caacb19 100644
--- a/src/hotspot/share/gc/serial/generation.hpp
+++ b/src/hotspot/share/gc/serial/generation.hpp
@@ -107,20 +107,6 @@ class Generation: public CHeapObj<mtGC> {
     return _reserved.contains(p);
   }
 
-  // Returns "true" iff this generation should be used to allocate an
-  // object of the given size.  Young generations might
-  // wish to exclude very large objects, for example, since, if allocated
-  // often, they would greatly increase the frequency of young-gen
-  // collection.
-  virtual bool should_allocate(size_t word_size, bool is_tlab) {
-    bool result = false;
-    size_t overflow_limit = (size_t)1 << (BitsPerSize_t - LogHeapWordSize);
-    if (!is_tlab || supports_tlab_allocation()) {
-      result = (word_size > 0) && (word_size < overflow_limit);
-    }
-    return result;
-  }
-
   // Allocate and returns a block of the requested size, or returns "null".
   // Assumes the caller has done any necessary locking.
   virtual HeapWord* allocate(size_t word_size, bool is_tlab) = 0;
@@ -131,31 +117,6 @@ class Generation: public CHeapObj<mtGC> {
   // Thread-local allocation buffers
   virtual bool supports_tlab_allocation() const { return false; }
 
-  // Returns "true" iff collect() should subsequently be called on this
-  // this generation. See comment below.
-  // This is a generic implementation which can be overridden.
-  //
-  // Note: in the current (1.4) implementation, when serialHeap's
-  // incremental_collection_will_fail flag is set, all allocations are
-  // slow path (the only fast-path place to allocate is DefNew, which
-  // will be full if the flag is set).
-  // Thus, older generations which collect younger generations should
-  // test this flag and collect if it is set.
-  virtual bool should_collect(bool   full,
-                              size_t word_size,
-                              bool   is_tlab) {
-    return (full || should_allocate(word_size, is_tlab));
-  }
-
-  // Perform a garbage collection.
-  // If full is true attempt a full garbage collection of this generation.
-  // Otherwise, attempting to (at least) free enough space to support an
-  // allocation of the given "word_size".
-  virtual void collect(bool   full,
-                       bool   clear_all_soft_refs,
-                       size_t word_size,
-                       bool   is_tlab) = 0;
-
   // Perform a heap collection, attempting to create (at least) enough
   // space to support an allocation of the given "word_size".  If
   // successful, perform the allocation and return the resulting
@@ -172,20 +133,7 @@ class Generation: public CHeapObj<mtGC> {
 
   virtual void verify() = 0;
 
-  struct StatRecord {
-    int invocations;
-    elapsedTimer accumulated_time;
-    StatRecord() :
-      invocations(0),
-      accumulated_time(elapsedTimer()) {}
-  };
-private:
-  StatRecord _stat_record;
 public:
-  StatRecord* stat_record() { return &_stat_record; }
-
-  virtual void print_summary_info_on(outputStream* st);
-
   // Performance Counter support
   virtual void update_counters() = 0;
   virtual CollectorCounters* counters() { return _gc_counters; }
diff --git a/src/hotspot/share/gc/serial/serialBlockOffsetTable.inline.hpp b/src/hotspot/share/gc/serial/serialBlockOffsetTable.inline.hpp
index fe003774eae..d8224cb774e 100644
--- a/src/hotspot/share/gc/serial/serialBlockOffsetTable.inline.hpp
+++ b/src/hotspot/share/gc/serial/serialBlockOffsetTable.inline.hpp
@@ -35,7 +35,8 @@ inline uint8_t* SerialBlockOffsetTable::entry_for_addr(const void* const p) cons
 }
 
 inline HeapWord* SerialBlockOffsetTable::addr_for_entry(const uint8_t* const p) const {
-  size_t delta = pointer_delta(p, _offset_base, sizeof(uint8_t));
+  // _offset_base can be "negative", so can't use pointer_delta().
+  size_t delta = p - _offset_base;
   HeapWord* result = (HeapWord*) (delta << CardTable::card_shift());
   assert(_reserved.contains(result),
          "out of bounds accessor from block offset array");
diff --git a/src/hotspot/share/gc/serial/serialFullGC.cpp b/src/hotspot/share/gc/serial/serialFullGC.cpp
index 1621aec7b64..6ebbfc3d6e6 100644
--- a/src/hotspot/share/gc/serial/serialFullGC.cpp
+++ b/src/hotspot/share/gc/serial/serialFullGC.cpp
@@ -366,9 +366,10 @@ class Compacter {
       }
 
       // Reset top and unused memory
-      space->set_top(get_compaction_top(i));
-      if (ZapUnusedHeapArea) {
-        space->mangle_unused_area();
+      HeapWord* new_top = get_compaction_top(i);
+      space->set_top(new_top);
+      if (ZapUnusedHeapArea && new_top < top) {
+        space->mangle_unused_area(MemRegion(new_top, top));
       }
     }
   }
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index b5bcd949c94..f34ed6cc29a 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -314,7 +314,7 @@ HeapWord* SerialHeap::mem_allocate_work(size_t size,
   for (uint try_count = 1, gclocker_stalled_count = 0; /* return or throw */; try_count += 1) {
 
     // First allocation attempt is lock-free.
-    Generation *young = _young_gen;
+    DefNewGeneration *young = _young_gen;
     if (young->should_allocate(size, is_tlab)) {
       result = young->par_allocate(size, is_tlab);
       if (result != nullptr) {
@@ -379,7 +379,7 @@ HeapWord* SerialHeap::mem_allocate_work(size_t size,
       gc_count_before = total_collections();
     }
 
-    VM_GenCollectForAllocation op(size, is_tlab, gc_count_before);
+    VM_SerialCollectForAllocation op(size, is_tlab, gc_count_before);
     VMThread::execute(&op);
     if (op.prologue_succeeded()) {
       result = op.result();
@@ -432,200 +432,60 @@ bool SerialHeap::must_clear_all_soft_refs() {
          _gc_cause == GCCause::_wb_full_gc;
 }
 
-void SerialHeap::collect_generation(Generation* gen, bool full, size_t size,
-                                    bool is_tlab, bool run_verification, bool clear_soft_refs) {
-  FormatBuffer<> title("Collect gen: %s", gen->short_name());
-  GCTraceTime(Trace, gc, phases) t1(title);
-  TraceCollectorStats tcs(gen->counters());
-  TraceMemoryManagerStats tmms(gen->gc_manager(), gc_cause(), heap()->is_young_gen(gen) ? "end of minor GC" : "end of major GC");
-
-  gen->stat_record()->invocations++;
-  gen->stat_record()->accumulated_time.start();
-
-  // Must be done anew before each collection because
-  // a previous collection will do mangling and will
-  // change top of some spaces.
-  record_gen_tops_before_GC();
+bool SerialHeap::is_young_gc_safe() const {
+  if (!_young_gen->to()->is_empty()) {
+    return false;
+  }
+  return _old_gen->promotion_attempt_is_safe(_young_gen->used());
+}
 
-  log_trace(gc)("%s invoke=%d size=" SIZE_FORMAT, heap()->is_young_gen(gen) ? "Young" : "Old", gen->stat_record()->invocations, size * HeapWordSize);
+bool SerialHeap::do_young_collection(bool clear_soft_refs) {
+  if (!is_young_gc_safe()) {
+    return false;
+  }
+  IsSTWGCActiveMark gc_active_mark;
+  SvcGCMarker sgcm(SvcGCMarker::MINOR);
+  GCIdMark gc_id_mark;
+  GCTraceCPUTime tcpu(_young_gen->gc_tracer());
+  GCTraceTime(Info, gc) t("Pause Young", nullptr, gc_cause(), true);
+  TraceCollectorStats tcs(_young_gen->counters());
+  TraceMemoryManagerStats tmms(_young_gen->gc_manager(), gc_cause(), "end of minor GC");
+  print_heap_before_gc();
+  const PreGenGCValues pre_gc_values = get_pre_gc_values();
 
-  if (run_verification && VerifyBeforeGC) {
+  increment_total_collections(false);
+  const bool should_verify = total_collections() >= VerifyGCStartAt;
+  if (should_verify && VerifyBeforeGC) {
+    prepare_for_verify();
     Universe::verify("Before GC");
   }
+  gc_prologue(false);
   COMPILER2_OR_JVMCI_PRESENT(DerivedPointerTable::clear());
 
-  // Do collection work
-  {
-    save_marks();   // save marks for all gens
+  save_marks();
 
-    gen->collect(full, clear_soft_refs, size, is_tlab);
-  }
+  bool result = _young_gen->collect(clear_soft_refs);
 
   COMPILER2_OR_JVMCI_PRESENT(DerivedPointerTable::update_pointers());
 
-  gen->stat_record()->accumulated_time.stop();
-
-  update_gc_stats(gen, full);
+  update_gc_stats(_young_gen, false);
 
-  if (run_verification && VerifyAfterGC) {
+  if (should_verify && VerifyAfterGC) {
     Universe::verify("After GC");
   }
-}
-
-void SerialHeap::do_collection(bool full,
-                               bool clear_all_soft_refs,
-                               size_t size,
-                               bool is_tlab,
-                               GenerationType max_generation) {
-  ResourceMark rm;
-  DEBUG_ONLY(Thread* my_thread = Thread::current();)
-
-  assert(SafepointSynchronize::is_at_safepoint(), "should be at safepoint");
-  assert(my_thread->is_VM_thread(), "only VM thread");
-  assert(Heap_lock->is_locked(),
-         "the requesting thread should have the Heap_lock");
-  guarantee(!is_stw_gc_active(), "collection is not reentrant");
-
-  if (GCLocker::check_active_before_gc()) {
-    return; // GC is disabled (e.g. JNI GetXXXCritical operation)
-  }
-
-  const bool do_clear_all_soft_refs = clear_all_soft_refs ||
-                          soft_ref_policy()->should_clear_all_soft_refs();
-
-  ClearedAllSoftRefs casr(do_clear_all_soft_refs, soft_ref_policy());
-
-  IsSTWGCActiveMark active_gc_mark;
-
-  bool complete = full && (max_generation == OldGen);
-  bool old_collects_young = complete;
-  bool do_young_collection = !old_collects_young && _young_gen->should_collect(full, size, is_tlab);
-
-  const PreGenGCValues pre_gc_values = get_pre_gc_values();
-
-  bool run_verification = total_collections() >= VerifyGCStartAt;
-  bool prepared_for_verification = false;
-  bool do_full_collection = false;
-
-  if (do_young_collection) {
-    GCIdMark gc_id_mark;
-    GCTraceCPUTime tcpu(((DefNewGeneration*)_young_gen)->gc_tracer());
-    GCTraceTime(Info, gc) t("Pause Young", nullptr, gc_cause(), true);
-
-    print_heap_before_gc();
-
-    if (run_verification && VerifyBeforeGC) {
-      prepare_for_verify();
-      prepared_for_verification = true;
-    }
-
-    gc_prologue(complete);
-    increment_total_collections(complete);
-
-    collect_generation(_young_gen,
-                       full,
-                       size,
-                       is_tlab,
-                       run_verification,
-                       do_clear_all_soft_refs);
-
-    if (size > 0 && (!is_tlab || _young_gen->supports_tlab_allocation()) &&
-        size * HeapWordSize <= _young_gen->unsafe_max_alloc_nogc()) {
-      // Allocation request was met by young GC.
-      size = 0;
-    }
-
-    // Ask if young collection is enough. If so, do the final steps for young collection,
-    // and fallthrough to the end.
-    do_full_collection = should_do_full_collection(size, full, is_tlab, max_generation);
-    if (!do_full_collection) {
-      // Adjust generation sizes.
-      _young_gen->compute_new_size();
-
-      print_heap_change(pre_gc_values);
-
-      // Track memory usage and detect low memory after GC finishes
-      MemoryService::track_memory_usage();
-
-      gc_epilogue(complete);
-    }
-
-    print_heap_after_gc();
-
-  } else {
-    // No young collection, ask if we need to perform Full collection.
-    do_full_collection = should_do_full_collection(size, full, is_tlab, max_generation);
-  }
 
-  if (do_full_collection) {
-    GCIdMark gc_id_mark;
-    GCTraceCPUTime tcpu(SerialFullGC::gc_tracer());
-    GCTraceTime(Info, gc) t("Pause Full", nullptr, gc_cause(), true);
+  _young_gen->compute_new_size();
 
-    print_heap_before_gc();
+  print_heap_change(pre_gc_values);
 
-    if (!prepared_for_verification && run_verification && VerifyBeforeGC) {
-      prepare_for_verify();
-    }
+  // Track memory usage and detect low memory after GC finishes
+  MemoryService::track_memory_usage();
 
-    if (!do_young_collection) {
-      gc_prologue(complete);
-      increment_total_collections(complete);
-    }
+  gc_epilogue(false);
 
-    // Accounting quirk: total full collections would be incremented when "complete"
-    // is set, by calling increment_total_collections above. However, we also need to
-    // account Full collections that had "complete" unset.
-    if (!complete) {
-      increment_total_full_collections();
-    }
+  print_heap_after_gc();
 
-    CodeCache::on_gc_marking_cycle_start();
-
-    ClassUnloadingContext ctx(1 /* num_nmethod_unlink_workers */,
-                              false /* unregister_nmethods_during_purge */,
-                              false /* lock_nmethod_free_separately */);
-
-    collect_generation(_old_gen,
-                       full,
-                       size,
-                       is_tlab,
-                       run_verification,
-                       do_clear_all_soft_refs);
-
-    CodeCache::on_gc_marking_cycle_finish();
-    CodeCache::arm_all_nmethods();
-
-    // Adjust generation sizes.
-    _old_gen->compute_new_size();
-    _young_gen->compute_new_size();
-
-    // Delete metaspaces for unloaded class loaders and clean up loader_data graph
-    ClassLoaderDataGraph::purge(/*at_safepoint*/true);
-    DEBUG_ONLY(MetaspaceUtils::verify();)
-
-    // Need to clear claim bits for the next mark.
-    ClassLoaderDataGraph::clear_claimed_marks();
-
-    // Resize the metaspace capacity after full collections
-    MetaspaceGC::compute_new_size();
-
-    print_heap_change(pre_gc_values);
-
-    // Track memory usage and detect low memory after GC finishes
-    MemoryService::track_memory_usage();
-
-    // Need to tell the epilogue code we are done with Full GC, regardless what was
-    // the initial value for "complete" flag.
-    gc_epilogue(true);
-
-    print_heap_after_gc();
-  }
-}
-
-bool SerialHeap::should_do_full_collection(size_t size, bool full, bool is_tlab,
-                                           SerialHeap::GenerationType max_gen) const {
-  return max_gen == OldGen && _old_gen->should_collect(full, size, is_tlab);
+  return result;
 }
 
 void SerialHeap::register_nmethod(nmethod* nm) {
@@ -649,10 +509,11 @@ void SerialHeap::prune_unlinked_nmethods() {
 }
 
 HeapWord* SerialHeap::satisfy_failed_allocation(size_t size, bool is_tlab) {
-  GCCauseSetter x(this, GCCause::_allocation_failure);
+  assert(size != 0, "precondition");
+
   HeapWord* result = nullptr;
 
-  assert(size != 0, "Precondition violated");
+  GCLocker::check_active_before_gc();
   if (GCLocker::is_active_and_needs_gc()) {
     // GC locker is active; instead of a collection we will attempt
     // to expand the heap, if there's room for expansion.
@@ -660,30 +521,14 @@ HeapWord* SerialHeap::satisfy_failed_allocation(size_t size, bool is_tlab) {
       result = expand_heap_and_allocate(size, is_tlab);
     }
     return result;   // Could be null if we are out of space.
-  } else if (!incremental_collection_will_fail(false /* don't consult_young */)) {
-    // Do an incremental collection.
-    do_collection(false,                     // full
-                  false,                     // clear_all_soft_refs
-                  size,                      // size
-                  is_tlab,                   // is_tlab
-                  SerialHeap::OldGen); // max_generation
-  } else {
-    log_trace(gc)(" :: Trying full because partial may fail :: ");
-    // Try a full collection; see delta for bug id 6266275
-    // for the original code and why this has been simplified
-    // with from-space allocation criteria modified and
-    // such allocation moved out of the safepoint path.
-    do_collection(true,                      // full
-                  false,                     // clear_all_soft_refs
-                  size,                      // size
-                  is_tlab,                   // is_tlab
-                  SerialHeap::OldGen); // max_generation
   }
 
-  result = attempt_allocation(size, is_tlab, false /*first_only*/);
+  // If young-gen can handle this allocation, attempt young-gc firstly.
+  bool should_run_young_gc = _young_gen->should_allocate(size, is_tlab);
+  collect_at_safepoint(!should_run_young_gc);
 
+  result = attempt_allocation(size, is_tlab, false /*first_only*/);
   if (result != nullptr) {
-    assert(is_in_reserved(result), "result not in heap");
     return result;
   }
 
@@ -700,17 +545,17 @@ HeapWord* SerialHeap::satisfy_failed_allocation(size_t size, bool is_tlab) {
   // attempt fails, an OOM exception will be thrown.
   {
     UIntFlagSetting flag_change(MarkSweepAlwaysCompactCount, 1); // Make sure the heap is fully compacted
-
-    do_collection(true,                      // full
-                  true,                      // clear_all_soft_refs
-                  size,                      // size
-                  is_tlab,                   // is_tlab
-                  SerialHeap::OldGen); // max_generation
+    const bool clear_all_soft_refs = true;
+    do_full_collection_no_gc_locker(clear_all_soft_refs);
   }
 
   result = attempt_allocation(size, is_tlab, false /* first_only */);
   if (result != nullptr) {
-    assert(is_in_reserved(result), "result not in heap");
+    return result;
+  }
+  // The previous full-gc can shrink the heap, so re-expand it.
+  result = expand_heap_and_allocate(size, is_tlab);
+  if (result != nullptr) {
     return result;
   }
 
@@ -786,6 +631,28 @@ void SerialHeap::scan_evacuated_objs(YoungGenScanClosure* young_cl,
   guarantee(young_gen()->promo_failure_scan_is_complete(), "Failed to finish scan");
 }
 
+void SerialHeap::try_collect_at_safepoint(bool full) {
+  assert(SafepointSynchronize::is_at_safepoint(), "precondition");
+  if (GCLocker::check_active_before_gc()) {
+    return;
+  }
+  collect_at_safepoint(full);
+}
+
+void SerialHeap::collect_at_safepoint(bool full) {
+  assert(!GCLocker::is_active(), "precondition");
+  bool clear_soft_refs = must_clear_all_soft_refs();
+
+  if (!full) {
+    bool success = do_young_collection(clear_soft_refs);
+    if (success) {
+      return;
+    }
+    // Upgrade to Full-GC if young-gc fails
+  }
+  do_full_collection_no_gc_locker(clear_soft_refs);
+}
+
 // public collection interfaces
 void SerialHeap::collect(GCCause::Cause cause) {
   // The caller doesn't have the Heap_lock
@@ -809,13 +676,11 @@ void SerialHeap::collect(GCCause::Cause cause) {
                            || (cause == GCCause::_gc_locker)
                 DEBUG_ONLY(|| (cause == GCCause::_scavenge_alot));
 
-  const GenerationType max_generation = should_run_young_gc
-                                      ? YoungGen
-                                      : OldGen;
-
   while (true) {
-    VM_GenCollectFull op(gc_count_before, full_gc_count_before,
-                         cause, max_generation);
+    VM_SerialGCCollect op(!should_run_young_gc,
+                          gc_count_before,
+                          full_gc_count_before,
+                          cause);
     VMThread::execute(&op);
 
     if (!GCCause::is_explicit_full_gc(cause)) {
@@ -838,27 +703,83 @@ void SerialHeap::collect(GCCause::Cause cause) {
 }
 
 void SerialHeap::do_full_collection(bool clear_all_soft_refs) {
-   do_full_collection(clear_all_soft_refs, OldGen);
+  if (GCLocker::check_active_before_gc()) {
+    return;
+  }
+  do_full_collection_no_gc_locker(clear_all_soft_refs);
 }
 
-void SerialHeap::do_full_collection(bool clear_all_soft_refs,
-                                    GenerationType last_generation) {
-  do_collection(true,                   // full
-                clear_all_soft_refs,    // clear_all_soft_refs
-                0,                      // size
-                false,                  // is_tlab
-                last_generation);       // last_generation
-  // Hack XXX FIX ME !!!
-  // A scavenge may not have been attempted, or may have
-  // been attempted and failed, because the old gen was too full
-  if (gc_cause() == GCCause::_gc_locker && incremental_collection_failed()) {
-    log_debug(gc, jni)("GC locker: Trying a full collection because scavenge failed");
-    // This time allow the old gen to be collected as well
-    do_collection(true,                // full
-                  clear_all_soft_refs, // clear_all_soft_refs
-                  0,                   // size
-                  false,               // is_tlab
-                  OldGen);             // last_generation
+void SerialHeap::do_full_collection_no_gc_locker(bool clear_all_soft_refs) {
+  IsSTWGCActiveMark gc_active_mark;
+  SvcGCMarker sgcm(SvcGCMarker::FULL);
+  GCIdMark gc_id_mark;
+  GCTraceCPUTime tcpu(SerialFullGC::gc_tracer());
+  GCTraceTime(Info, gc) t("Pause Full", nullptr, gc_cause(), true);
+  TraceCollectorStats tcs(_old_gen->counters());
+  TraceMemoryManagerStats tmms(_old_gen->gc_manager(), gc_cause(), "end of major GC");
+  const PreGenGCValues pre_gc_values = get_pre_gc_values();
+  print_heap_before_gc();
+
+  increment_total_collections(true);
+  const bool should_verify = total_collections() >= VerifyGCStartAt;
+  if (should_verify && VerifyBeforeGC) {
+    prepare_for_verify();
+    Universe::verify("Before GC");
+  }
+
+  gc_prologue(true);
+  COMPILER2_OR_JVMCI_PRESENT(DerivedPointerTable::clear());
+  CodeCache::on_gc_marking_cycle_start();
+  ClassUnloadingContext ctx(1 /* num_nmethod_unlink_workers */,
+                            false /* unregister_nmethods_during_purge */,
+                            false /* lock_nmethod_free_separately */);
+
+  STWGCTimer* gc_timer = SerialFullGC::gc_timer();
+  gc_timer->register_gc_start();
+
+  SerialOldTracer* gc_tracer = SerialFullGC::gc_tracer();
+  gc_tracer->report_gc_start(gc_cause(), gc_timer->gc_start());
+
+  pre_full_gc_dump(gc_timer);
+
+  SerialFullGC::invoke_at_safepoint(clear_all_soft_refs);
+
+  post_full_gc_dump(gc_timer);
+
+  gc_timer->register_gc_end();
+
+  gc_tracer->report_gc_end(gc_timer->gc_end(), gc_timer->time_partitions());
+  CodeCache::on_gc_marking_cycle_finish();
+  CodeCache::arm_all_nmethods();
+  COMPILER2_OR_JVMCI_PRESENT(DerivedPointerTable::update_pointers());
+
+  // Adjust generation sizes.
+  _old_gen->compute_new_size();
+  _young_gen->compute_new_size();
+
+  // Delete metaspaces for unloaded class loaders and clean up loader_data graph
+  ClassLoaderDataGraph::purge(/*at_safepoint*/true);
+  DEBUG_ONLY(MetaspaceUtils::verify();)
+
+  // Need to clear claim bits for the next mark.
+  ClassLoaderDataGraph::clear_claimed_marks();
+
+  // Resize the metaspace capacity after full collections
+  MetaspaceGC::compute_new_size();
+
+  print_heap_change(pre_gc_values);
+
+  // Track memory usage and detect low memory after GC finishes
+  MemoryService::track_memory_usage();
+
+  // Need to tell the epilogue code we are done with Full GC, regardless what was
+  // the initial value for "complete" flag.
+  gc_epilogue(true);
+
+  print_heap_after_gc();
+
+  if (should_verify && VerifyAfterGC) {
+    Universe::verify("After GC");
   }
 }
 
@@ -982,11 +903,7 @@ bool SerialHeap::print_location(outputStream* st, void* addr) const {
 }
 
 void SerialHeap::print_tracing_info() const {
-  if (log_is_enabled(Debug, gc, heap, exit)) {
-    LogStreamHandle(Debug, gc, heap, exit) lsh;
-    _young_gen->print_summary_info_on(&lsh);
-    _old_gen->print_summary_info_on(&lsh);
-  }
+ // Does nothing
 }
 
 void SerialHeap::print_heap_change(const PreGenGCValues& pre_gc_values) const {
@@ -1038,12 +955,3 @@ void SerialHeap::gc_epilogue(bool full) {
 
   MetaspaceCounters::update_performance_counters();
 };
-
-#ifndef PRODUCT
-void SerialHeap::record_gen_tops_before_GC() {
-  if (ZapUnusedHeapArea) {
-    _young_gen->record_spaces_top();
-    _old_gen->record_spaces_top();
-  }
-}
-#endif  // not PRODUCT
diff --git a/src/hotspot/share/gc/serial/serialHeap.hpp b/src/hotspot/share/gc/serial/serialHeap.hpp
index fca877e2925..4b606099bf3 100644
--- a/src/hotspot/share/gc/serial/serialHeap.hpp
+++ b/src/hotspot/share/gc/serial/serialHeap.hpp
@@ -67,8 +67,6 @@ class SerialHeap : public CollectedHeap {
   friend class DefNewGeneration;
   friend class TenuredGeneration;
   friend class SerialFullGC;
-  friend class VM_GenCollectForAllocation;
-  friend class VM_GenCollectFull;
   friend class VM_GC_HeapInspection;
   friend class VM_HeapDumper;
   friend class HeapInspection;
@@ -87,7 +85,7 @@ class SerialHeap : public CollectedHeap {
   TenuredGeneration* _old_gen;
   HeapWord* _young_gen_saved_top;
   HeapWord* _old_gen_saved_top;
-private:
+
   // The singleton CardTable Remembered Set.
   CardTableRS* _rem_set;
 
@@ -98,16 +96,13 @@ class SerialHeap : public CollectedHeap {
   // condition that caused that incremental collection to fail.
   bool _incremental_collection_failed;
 
-  // Collects the given generation.
-  void collect_generation(Generation* gen, bool full, size_t size, bool is_tlab,
-                          bool run_verification, bool clear_soft_refs);
+  bool do_young_collection(bool clear_soft_refs);
 
   // Reserve aligned space for the heap as needed by the contained generations.
   ReservedHeapSpace allocate(size_t alignment);
 
   PreGenGCValues get_pre_gc_values() const;
 
-private:
   GCMemoryManager* _young_manager;
   GCMemoryManager* _old_manager;
 
@@ -116,29 +111,17 @@ class SerialHeap : public CollectedHeap {
                                bool   is_tlab,
                                bool   first_only);
 
-  // Helper function for two callbacks below.
-  // Considers collection of the first max_level+1 generations.
-  void do_collection(bool           full,
-                     bool           clear_all_soft_refs,
-                     size_t         size,
-                     bool           is_tlab,
-                     GenerationType max_generation);
-
-  // Callback from VM_GenCollectForAllocation operation.
-  // This function does everything necessary/possible to satisfy an
-  // allocation request that failed in the youngest generation that should
-  // have handled it (including collection, expansion, etc.)
-  HeapWord* satisfy_failed_allocation(size_t size, bool is_tlab);
-
-  // Callback from VM_GenCollectFull operation.
-  // Perform a full collection of the first max_level+1 generations.
   void do_full_collection(bool clear_all_soft_refs) override;
-  void do_full_collection(bool clear_all_soft_refs, GenerationType max_generation);
+  void do_full_collection_no_gc_locker(bool clear_all_soft_refs);
+
+  void collect_at_safepoint(bool full);
 
   // Does the "cause" of GC indicate that
   // we absolutely __must__ clear soft refs?
   bool must_clear_all_soft_refs();
 
+  bool is_young_gc_safe() const;
+
 public:
   // Returns JNI_OK on success
   jint initialize() override;
@@ -159,6 +142,15 @@ class SerialHeap : public CollectedHeap {
 
   HeapWord* mem_allocate(size_t size, bool*  gc_overhead_limit_was_exceeded) override;
 
+  // Callback from VM_SerialCollectForAllocation operation.
+  // This function does everything necessary/possible to satisfy an
+  // allocation request that failed in the youngest generation that should
+  // have handled it (including collection, expansion, etc.)
+  HeapWord* satisfy_failed_allocation(size_t size, bool is_tlab);
+
+  // Callback from VM_SerialGCCollect.
+  void try_collect_at_safepoint(bool full);
+
   // Perform a full collection of the heap; intended for use in implementing
   // "System.gc". This implies as full a collection as the CollectedHeap
   // supports. Caller does not hold the Heap_lock on entry.
@@ -302,13 +294,6 @@ class SerialHeap : public CollectedHeap {
   HeapWord* mem_allocate_work(size_t size,
                               bool is_tlab);
 
-  // Save the tops of the spaces in all generations
-  void record_gen_tops_before_GC() PRODUCT_RETURN;
-
-  // Return true if we need to perform full collection.
-  bool should_do_full_collection(size_t size, bool full,
-                                 bool is_tlab, GenerationType max_gen) const;
-
 private:
   MemoryPool* _eden_pool;
   MemoryPool* _survivor_pool;
diff --git a/src/hotspot/share/gc/serial/serialVMOperations.cpp b/src/hotspot/share/gc/serial/serialVMOperations.cpp
index 9e88fa59711..36805f619ec 100644
--- a/src/hotspot/share/gc/serial/serialVMOperations.cpp
+++ b/src/hotspot/share/gc/serial/serialVMOperations.cpp
@@ -26,9 +26,7 @@
 #include "gc/serial/serialVMOperations.hpp"
 #include "gc/shared/gcLocker.hpp"
 
-void VM_GenCollectForAllocation::doit() {
-  SvcGCMarker sgcm(SvcGCMarker::MINOR);
-
+void VM_SerialCollectForAllocation::doit() {
   SerialHeap* gch = SerialHeap::heap();
   GCCauseSetter gccs(gch, _gc_cause);
   _result = gch->satisfy_failed_allocation(_word_size, _tlab);
@@ -39,10 +37,8 @@ void VM_GenCollectForAllocation::doit() {
   }
 }
 
-void VM_GenCollectFull::doit() {
-  SvcGCMarker sgcm(SvcGCMarker::FULL);
-
+void VM_SerialGCCollect::doit() {
   SerialHeap* gch = SerialHeap::heap();
   GCCauseSetter gccs(gch, _gc_cause);
-  gch->do_full_collection(gch->must_clear_all_soft_refs(), _max_generation);
+  gch->try_collect_at_safepoint(_full);
 }
diff --git a/src/hotspot/share/gc/serial/serialVMOperations.hpp b/src/hotspot/share/gc/serial/serialVMOperations.hpp
index a056740dd85..294920f4ae2 100644
--- a/src/hotspot/share/gc/serial/serialVMOperations.hpp
+++ b/src/hotspot/share/gc/serial/serialVMOperations.hpp
@@ -28,37 +28,32 @@
 #include "gc/serial/serialHeap.hpp"
 #include "gc/shared/gcVMOperations.hpp"
 
-class VM_GenCollectForAllocation : public VM_CollectForAllocation {
+class VM_SerialCollectForAllocation : public VM_CollectForAllocation {
  private:
   bool        _tlab;                       // alloc is of a tlab.
  public:
-  VM_GenCollectForAllocation(size_t word_size,
-                             bool tlab,
-                             uint gc_count_before)
+  VM_SerialCollectForAllocation(size_t word_size,
+                                bool tlab,
+                                uint gc_count_before)
     : VM_CollectForAllocation(word_size, gc_count_before, GCCause::_allocation_failure),
       _tlab(tlab) {
     assert(word_size != 0, "An allocation should always be requested with this operation.");
   }
-  ~VM_GenCollectForAllocation()  {}
-  virtual VMOp_Type type() const { return VMOp_GenCollectForAllocation; }
+  virtual VMOp_Type type() const { return VMOp_SerialCollectForAllocation; }
   virtual void doit();
 };
 
 // VM operation to invoke a collection of the heap as a
 // SerialHeap heap.
-class VM_GenCollectFull: public VM_GC_Operation {
- private:
-  SerialHeap::GenerationType _max_generation;
+class VM_SerialGCCollect: public VM_GC_Operation {
  public:
-  VM_GenCollectFull(uint gc_count_before,
-                    uint full_gc_count_before,
-                    GCCause::Cause gc_cause,
-                    SerialHeap::GenerationType max_generation)
-    : VM_GC_Operation(gc_count_before, gc_cause, full_gc_count_before,
-                      max_generation != SerialHeap::YoungGen /* full */),
-      _max_generation(max_generation) { }
-  ~VM_GenCollectFull() {}
-  virtual VMOp_Type type() const { return VMOp_GenCollectFull; }
+  VM_SerialGCCollect(bool full,
+                     uint gc_count_before,
+                     uint full_gc_count_before,
+                     GCCause::Cause gc_cause)
+    : VM_GC_Operation(gc_count_before, gc_cause, full_gc_count_before, full) {}
+
+  virtual VMOp_Type type() const { return VMOp_SerialGCCollect; }
   virtual void doit();
 };
 
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index 8a851fba642..9602553a6f3 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -55,8 +55,7 @@ bool TenuredGeneration::grow_by(size_t bytes) {
 
     // Fix for bug #4668531
     if (ZapUnusedHeapArea) {
-      MemRegion mangle_region(space()->end(),
-      (HeapWord*)_virtual_space.high());
+      MemRegion mangle_region(space()->end(), (HeapWord*)_virtual_space.high());
       SpaceMangler::mangle_region(mangle_region);
     }
 
@@ -344,37 +343,6 @@ void TenuredGeneration::gc_prologue() {
   _used_at_prologue = used();
 }
 
-bool TenuredGeneration::should_collect(bool  full,
-                                       size_t size,
-                                       bool   is_tlab) {
-  // This should be one big conditional or (||), but I want to be able to tell
-  // why it returns what it returns (without re-evaluating the conditionals
-  // in case they aren't idempotent), so I'm doing it this way.
-  // DeMorgan says it's okay.
-  if (full) {
-    log_trace(gc)("TenuredGeneration::should_collect: because full");
-    return true;
-  }
-  if (should_allocate(size, is_tlab)) {
-    log_trace(gc)("TenuredGeneration::should_collect: because should_allocate(" SIZE_FORMAT ")", size);
-    return true;
-  }
-  // If we don't have very much free space.
-  // XXX: 10000 should be a percentage of the capacity!!!
-  if (free() < 10000) {
-    log_trace(gc)("TenuredGeneration::should_collect: because free(): " SIZE_FORMAT, free());
-    return true;
-  }
-  // If we had to expand to accommodate promotions from the young generation
-  if (_capacity_at_prologue < capacity()) {
-    log_trace(gc)("TenuredGeneration::should_collect: because_capacity_at_prologue: " SIZE_FORMAT " < capacity(): " SIZE_FORMAT,
-        _capacity_at_prologue, capacity());
-    return true;
-  }
-
-  return false;
-}
-
 void TenuredGeneration::compute_new_size() {
   assert_locked_or_safepoint(Heap_lock);
 
@@ -453,29 +421,6 @@ oop TenuredGeneration::promote(oop obj, size_t obj_size) {
   return new_obj;
 }
 
-void TenuredGeneration::collect(bool   full,
-                                bool   clear_all_soft_refs,
-                                size_t size,
-                                bool   is_tlab) {
-  SerialHeap* gch = SerialHeap::heap();
-
-  STWGCTimer* gc_timer = SerialFullGC::gc_timer();
-  gc_timer->register_gc_start();
-
-  SerialOldTracer* gc_tracer = SerialFullGC::gc_tracer();
-  gc_tracer->report_gc_start(gch->gc_cause(), gc_timer->gc_start());
-
-  gch->pre_full_gc_dump(gc_timer);
-
-  SerialFullGC::invoke_at_safepoint(clear_all_soft_refs);
-
-  gch->post_full_gc_dump(gc_timer);
-
-  gc_timer->register_gc_end();
-
-  gc_tracer->report_gc_end(gc_timer->gc_end(), gc_timer->time_partitions());
-}
-
 HeapWord*
 TenuredGeneration::expand_and_allocate(size_t word_size, bool is_tlab) {
   assert(!is_tlab, "TenuredGeneration does not support TLAB allocation");
@@ -508,14 +453,6 @@ void TenuredGeneration::complete_loaded_archive_space(MemRegion archive_space) {
 void TenuredGeneration::gc_epilogue() {
   // update the generation and space performance counters
   update_counters();
-  if (ZapUnusedHeapArea) {
-    _the_space->check_mangled_unused_area_complete();
-  }
-}
-
-void TenuredGeneration::record_spaces_top() {
-  assert(ZapUnusedHeapArea, "Not mangling unused space");
-  _the_space->set_top_for_allocations();
 }
 
 void TenuredGeneration::verify() {
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
index 9cbf7fef5fc..cfc18b92f2a 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
@@ -135,25 +135,23 @@ class TenuredGeneration: public Generation {
   virtual inline HeapWord* allocate(size_t word_size, bool is_tlab);
   virtual inline HeapWord* par_allocate(size_t word_size, bool is_tlab);
 
-  virtual void collect(bool full,
-                       bool clear_all_soft_refs,
-                       size_t size,
-                       bool is_tlab);
-
   HeapWord* expand_and_allocate(size_t size, bool is_tlab);
 
   void gc_prologue();
   void gc_epilogue();
 
-  bool should_collect(bool   full,
-                      size_t word_size,
-                      bool   is_tlab);
+  bool should_allocate(size_t word_size, bool is_tlab) {
+    bool result = false;
+    size_t overflow_limit = (size_t)1 << (BitsPerSize_t - LogHeapWordSize);
+    if (!is_tlab || supports_tlab_allocation()) {
+      result = (word_size > 0) && (word_size < overflow_limit);
+    }
+    return result;
+  }
 
   // Performance Counter support
   void update_counters();
 
-  void record_spaces_top();
-
   // Statistics
 
   void update_gc_stats(Generation* current_generation, bool full);
diff --git a/src/hotspot/share/gc/serial/vmStructs_serial.hpp b/src/hotspot/share/gc/serial/vmStructs_serial.hpp
index e5ce220195c..994843a7eec 100644
--- a/src/hotspot/share/gc/serial/vmStructs_serial.hpp
+++ b/src/hotspot/share/gc/serial/vmStructs_serial.hpp
@@ -36,10 +36,6 @@
                             static_field)                                                                   \
   nonstatic_field(Generation,                        _reserved,              MemRegion)                     \
   nonstatic_field(Generation,                        _virtual_space,         VirtualSpace)                  \
-  nonstatic_field(Generation,                        _stat_record,           Generation::StatRecord)        \
-                                                                                                            \
-  nonstatic_field(Generation::StatRecord,            invocations,            int)                           \
-  nonstatic_field(Generation::StatRecord,            accumulated_time,       elapsedTimer)                  \
                                                                                                             \
   nonstatic_field(TenuredGeneration,                 _rs,                    CardTableRS*)                  \
   nonstatic_field(TenuredGeneration,                 _bts,                   SerialBlockOffsetTable*)       \
@@ -67,7 +63,6 @@
                           declare_toplevel_type,                              \
                           declare_integer_type)                               \
   declare_toplevel_type(Generation)                                           \
-  declare_toplevel_type(Generation::StatRecord)                               \
   declare_type(SerialHeap,                   CollectedHeap)                   \
   declare_type(TenuredGeneration,            Generation)                      \
                                                                               \
diff --git a/src/hotspot/share/gc/shared/gcVMOperations.cpp b/src/hotspot/share/gc/shared/gcVMOperations.cpp
index d4a63605578..4cf1a4ccbaf 100644
--- a/src/hotspot/share/gc/shared/gcVMOperations.cpp
+++ b/src/hotspot/share/gc/shared/gcVMOperations.cpp
@@ -130,9 +130,9 @@ bool VM_GC_Operation::doit_prologue() {
 
 
 void VM_GC_Operation::doit_epilogue() {
-  // Clean up old interpreter OopMap entries that were replaced
-  // during the GC thread root traversal.
-  OopMapCache::cleanup_old_entries();
+  // GC thread root traversal likely used OopMapCache a lot, which
+  // might have created lots of old entries. Trigger the cleanup now.
+  OopMapCache::trigger_cleanup();
   if (Universe::has_reference_pending_list()) {
     Heap_lock->notify_all();
   }
diff --git a/src/hotspot/share/gc/shared/gcVMOperations.hpp b/src/hotspot/share/gc/shared/gcVMOperations.hpp
index c7a2edb1355..aa007fec5a6 100644
--- a/src/hotspot/share/gc/shared/gcVMOperations.hpp
+++ b/src/hotspot/share/gc/shared/gcVMOperations.hpp
@@ -41,10 +41,10 @@
 //      VM_GC_Operation
 //        VM_GC_HeapInspection
 //        VM_PopulateDynamicDumpSharedSpace
-//        VM_GenCollectFull
+//        VM_SerialGCCollect
 //        VM_ParallelGCSystemGC
 //        VM_CollectForAllocation
-//          VM_GenCollectForAllocation
+//          VM_SerialCollectForAllocation
 //          VM_ParallelGCFailedAllocation
 //      VM_Verify
 //      VM_PopulateDumpSharedSpace
@@ -63,13 +63,13 @@
 //     is specified; and also the attach "inspectheap" operation
 //
 //  VM_CollectForAllocation
-//  VM_GenCollectForAllocation
+//  VM_SerialCollectForAllocation
 //  VM_ParallelGCFailedAllocation
 //   - this operation is invoked when allocation is failed;
 //     operation performs garbage collection and tries to
 //     allocate afterwards;
 //
-//  VM_GenCollectFull
+//  VM_SerialGCCollect
 //  VM_ParallelGCSystemGC
 //   - these operations perform full collection of heaps of
 //     different kind
diff --git a/src/hotspot/share/gc/shared/memAllocator.hpp b/src/hotspot/share/gc/shared/memAllocator.hpp
index f299dd633e5..a0450af4450 100644
--- a/src/hotspot/share/gc/shared/memAllocator.hpp
+++ b/src/hotspot/share/gc/shared/memAllocator.hpp
@@ -125,23 +125,17 @@ class InternalOOMEMark: public StackObj {
 
  public:
   explicit InternalOOMEMark(JavaThread* thread) {
-    if (thread != nullptr) {
-      _outer = thread->is_in_internal_oome_mark();
-      thread->set_is_in_internal_oome_mark(true);
-      _thread = thread;
-    } else {
-      _outer = false;
-      _thread = nullptr;
-    }
+    assert(thread != nullptr, "nullptr is not supported");
+    _outer = thread->is_in_internal_oome_mark();
+    thread->set_is_in_internal_oome_mark(true);
+    _thread = thread;
   }
 
   ~InternalOOMEMark() {
-    if (_thread != nullptr) {
-      // Check that only InternalOOMEMark sets
-      // JavaThread::_is_in_internal_oome_mark
-      assert(_thread->is_in_internal_oome_mark(), "must be");
-      _thread->set_is_in_internal_oome_mark(_outer);
-    }
+    // Check that only InternalOOMEMark sets
+    // JavaThread::_is_in_internal_oome_mark
+    assert(_thread->is_in_internal_oome_mark(), "must be");
+    _thread->set_is_in_internal_oome_mark(_outer);
   }
 
   JavaThread* thread() const  { return _thread; }
diff --git a/src/hotspot/share/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp
index 43e4a03ca11..0eb9d2520b7 100644
--- a/src/hotspot/share/gc/shared/space.cpp
+++ b/src/hotspot/share/gc/shared/space.cpp
@@ -27,7 +27,7 @@
 #include "classfile/vmSymbols.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "gc/shared/space.hpp"
-#include "gc/shared/spaceDecorator.inline.hpp"
+#include "gc/shared/spaceDecorator.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
@@ -42,13 +42,7 @@
 ContiguousSpace::ContiguousSpace():
   _bottom(nullptr),
   _end(nullptr),
-  _top(nullptr) {
-  _mangler = new GenSpaceMangler(this);
-}
-
-ContiguousSpace::~ContiguousSpace() {
-  delete _mangler;
-}
+  _top(nullptr) {}
 
 void ContiguousSpace::initialize(MemRegion mr,
                                  bool clear_space,
@@ -73,26 +67,14 @@ void ContiguousSpace::clear(bool mangle_space) {
 
 #ifndef PRODUCT
 
-void ContiguousSpace::set_top_for_allocations() {
-  mangler()->set_top_for_allocations(top());
-}
-void ContiguousSpace::check_mangled_unused_area(HeapWord* limit) {
-  mangler()->check_mangled_unused_area(limit);
+void ContiguousSpace::mangle_unused_area() {
+  mangle_unused_area(MemRegion(_top, _end));
 }
 
-void ContiguousSpace::check_mangled_unused_area_complete() {
-  mangler()->check_mangled_unused_area_complete();
+void ContiguousSpace::mangle_unused_area(MemRegion mr) {
+  SpaceMangler::mangle_region(mr);
 }
 
-// Mangled only the unused space that has not previously
-// been mangled and that has not been allocated since being
-// mangled.
-void ContiguousSpace::mangle_unused_area() {
-  mangler()->mangle_unused_area();
-}
-void ContiguousSpace::mangle_unused_area_complete() {
-  mangler()->mangle_unused_area_complete();
-}
 #endif  // NOT_PRODUCT
 
 void ContiguousSpace::print() const { print_on(tty); }
diff --git a/src/hotspot/share/gc/shared/space.hpp b/src/hotspot/share/gc/shared/space.hpp
index 8dcd954dcf4..5d361ce8e50 100644
--- a/src/hotspot/share/gc/shared/space.hpp
+++ b/src/hotspot/share/gc/shared/space.hpp
@@ -41,9 +41,6 @@
 // implementations for keeping track of free and used space,
 // for iterating over objects and free blocks, etc.
 
-// Forward decls.
-class GenSpaceMangler;
-
 // A space in which the free area is contiguous.  It therefore supports
 // faster allocation, and compaction.
 //
@@ -57,10 +54,6 @@ class ContiguousSpace: public CHeapObj<mtGC> {
   HeapWord* _bottom;
   HeapWord* _end;
   HeapWord* _top;
-  // A helper for mangling the unused area of the space in debug builds.
-  GenSpaceMangler* _mangler;
-
-  GenSpaceMangler* mangler() { return _mangler; }
 
   // Allocation helpers (return null if full).
   inline HeapWord* allocate_impl(size_t word_size);
@@ -68,7 +61,6 @@ class ContiguousSpace: public CHeapObj<mtGC> {
 
 public:
   ContiguousSpace();
-  ~ContiguousSpace();
 
   // Accessors
   HeapWord* bottom() const         { return _bottom; }
@@ -115,24 +107,8 @@ class ContiguousSpace: public CHeapObj<mtGC> {
   // had allocation performed in it, but is now to be considered empty.
   void clear(bool mangle_space);
 
-  // Used to save the space's current top for later use during mangling.
-  void set_top_for_allocations() PRODUCT_RETURN;
-
-  // For detecting GC bugs.  Should only be called at GC boundaries, since
-  // some unused space may be used as scratch space during GC's.
-  // We also call this when expanding a space to satisfy an allocation
-  // request. See bug #4668531
-  // Mangle regions in the space from the current top up to the
-  // previously mangled part of the space.
   void mangle_unused_area() PRODUCT_RETURN;
-  // Mangle [top, end)
-  void mangle_unused_area_complete() PRODUCT_RETURN;
-
-  // Do some sparse checking on the area that should have been mangled.
-  void check_mangled_unused_area(HeapWord* limit) PRODUCT_RETURN;
-  // Check the complete area that should have been mangled.
-  // This code may be null depending on the macro DEBUG_MANGLING.
-  void check_mangled_unused_area_complete() PRODUCT_RETURN;
+  void mangle_unused_area(MemRegion mr) PRODUCT_RETURN;
 
   MemRegion used_region() const { return MemRegion(bottom(), top()); }
 
diff --git a/src/hotspot/share/gc/shared/spaceDecorator.cpp b/src/hotspot/share/gc/shared/spaceDecorator.cpp
index 69ffbf51561..cb554f48e59 100644
--- a/src/hotspot/share/gc/shared/spaceDecorator.cpp
+++ b/src/hotspot/share/gc/shared/spaceDecorator.cpp
@@ -23,117 +23,15 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/parallel/mutableSpace.hpp"
-#include "gc/shared/space.hpp"
-#include "gc/shared/spaceDecorator.inline.hpp"
-#include "logging/log.hpp"
+#include "gc/shared/spaceDecorator.hpp"
 #include "utilities/copy.hpp"
 
-// Catch-all file for utility classes
-
-#ifndef PRODUCT
-
-// Returns true is the location q matches the mangling
-// pattern.
-bool SpaceMangler::is_mangled(HeapWord* q) {
-  // This test loses precision but is good enough
-  return badHeapWord == (max_juint & reinterpret_cast<uintptr_t>(*q));
-}
-
-
-void SpaceMangler::set_top_for_allocations(HeapWord* v)  {
-  if (v < end()) {
-    assert(!CheckZapUnusedHeapArea || is_mangled(v),
-      "The high water mark is not mangled");
-  }
-  _top_for_allocations = v;
-}
-
-// Mangle only the unused space that has not previously
-// been mangled and that has not been allocated since being
-// mangled.
-void SpaceMangler::mangle_unused_area() {
-  assert(ZapUnusedHeapArea, "Mangling should not be in use");
-  // Mangle between top and the high water mark.  Safeguard
-  // against the space changing since top_for_allocations was
-  // set.
-  HeapWord* mangled_end = MIN2(top_for_allocations(), end());
-  if (top() < mangled_end) {
-    MemRegion mangle_mr(top(), mangled_end);
-    SpaceMangler::mangle_region(mangle_mr);
-    // Light weight check of mangling.
-    check_mangled_unused_area(end());
-  }
-  // Complete check of unused area which is functional when
-  // DEBUG_MANGLING is defined.
-  check_mangled_unused_area_complete();
-}
-
-// A complete mangle is expected in the
-// exceptional case where top_for_allocations is not
-// properly tracking the high water mark for mangling.
-// This can be the case when to-space is being used for
-// scratch space during a mark-sweep-compact.  See
-// contribute_scratch().
-void SpaceMangler::mangle_unused_area_complete() {
-  assert(ZapUnusedHeapArea, "Mangling should not be in use");
-  MemRegion mangle_mr(top(), end());
-  SpaceMangler::mangle_region(mangle_mr);
-}
+#ifdef ASSERT
 
 // Simply mangle the MemRegion mr.
 void SpaceMangler::mangle_region(MemRegion mr) {
   assert(ZapUnusedHeapArea, "Mangling should not be in use");
-#ifdef ASSERT
   Copy::fill_to_words(mr.start(), mr.word_size(), badHeapWord);
-#endif
 }
 
-// Check that top, top_for_allocations and the last
-// word of the space are mangled.  In a tight memory
-// situation even this light weight mangling could
-// cause paging by touching the end of the space.
-void  SpaceMangler::check_mangled_unused_area(HeapWord* limit) {
-  if (CheckZapUnusedHeapArea) {
-    // This method can be called while the spaces are
-    // being reshaped so skip the test if the end of the
-    // space is beyond the specified limit;
-    if (end() > limit) return;
-
-    assert(top() == end() ||
-           (is_mangled(top())), "Top not mangled");
-    assert((top_for_allocations() < top()) ||
-           (top_for_allocations() >= end()) ||
-           (is_mangled(top_for_allocations())),
-           "Older unused not mangled");
-    assert(top() == end() ||
-           (is_mangled(end() - 1)), "End not properly mangled");
-    // Only does checking when DEBUG_MANGLING is defined.
-    check_mangled_unused_area_complete();
-  }
-}
-
-#undef DEBUG_MANGLING
-// This should only be used while debugging the mangling
-// because of the high cost of checking the completeness.
-void  SpaceMangler::check_mangled_unused_area_complete() {
-  if (CheckZapUnusedHeapArea) {
-    assert(ZapUnusedHeapArea, "Not mangling unused area");
-#ifdef DEBUG_MANGLING
-    HeapWord* q = top();
-    HeapWord* limit = end();
-
-    bool passed = true;
-    while (q < limit) {
-      if (!is_mangled(q)) {
-        passed = false;
-        break;
-      }
-      q++;
-    }
-    assert(passed, "Mangling is not complete");
-#endif
-  }
-}
-#undef DEBUG_MANGLING
-#endif // not PRODUCT
+#endif // ASSERT
diff --git a/src/hotspot/share/gc/shared/spaceDecorator.hpp b/src/hotspot/share/gc/shared/spaceDecorator.hpp
index 688be70bada..665dc0ce453 100644
--- a/src/hotspot/share/gc/shared/spaceDecorator.hpp
+++ b/src/hotspot/share/gc/shared/spaceDecorator.hpp
@@ -29,7 +29,7 @@
 #include "memory/memRegion.hpp"
 #include "utilities/globalDefinitions.hpp"
 
-class SpaceDecorator: public AllStatic {
+class SpaceDecorator : AllStatic {
  public:
   // Initialization flags.
   static const bool Clear               = true;
@@ -38,114 +38,8 @@ class SpaceDecorator: public AllStatic {
   static const bool DontMangle          = false;
 };
 
-// Functionality for use with class Space and class MutableSpace.
-//   The approach taken with the mangling is to mangle all
-// the space initially and then to mangle areas that have
-// been allocated since the last collection.  Mangling is
-// done in the context of a generation and in the context
-// of a space.
-//   The space in a generation is mangled when it is first
-// initialized and when the generation grows.  The spaces
-// are not necessarily up-to-date when this mangling occurs
-// and the method mangle_region() is used.
-//   After allocations have been done in a space, the space generally
-// need to be remangled.  Remangling is only done on the
-// recently allocated regions in the space.  Typically, that is
-// the region between the new top and the top just before a
-// garbage collection.
-//   An exception to the usual mangling in a space is done when the
-// space is used for an extraordinary purpose.  Specifically, when
-// to-space is used as scratch space for a mark-sweep-compact
-// collection.
-//   Spaces are mangled after a collection.  If the generation
-// grows after a collection, the added space is mangled as part of
-// the growth of the generation.  No additional mangling is needed when the
-// spaces are resized after an expansion.
-//   The class SpaceMangler keeps a pointer to the top of the allocated
-// area and provides the methods for doing the piece meal mangling.
-// Methods for doing spaces and full checking of the mangling are
-// included.  The full checking is done if DEBUG_MANGLING is defined.
-//   GenSpaceMangler is used with the SerialHeap collectors and
-// MutableSpaceMangler is used with the ParallelScavengeHeap collectors.
-// These subclasses abstract the differences in the types of spaces used
-// by each heap.
-
-class SpaceMangler: public CHeapObj<mtGC> {
-  friend class VMStructs;
-
-  // High water mark for allocations.  Typically, the space above
-  // this point have been mangle previously and don't need to be
-  // touched again.  Space below this point has been allocated
-  // and remangling is needed between the current top and this
-  // high water mark.
-  HeapWord* _top_for_allocations;
-  HeapWord* top_for_allocations() { return _top_for_allocations; }
-
- public:
-
-  // Setting _top_for_allocations to null at initialization
-  // makes it always below top so that mangling done as part
-  // of the initialize() call of a space does nothing (as it
-  // should since the mangling is done as part of the constructor
-  // for the space.
-  SpaceMangler() : _top_for_allocations(nullptr) {}
-
-  // Methods for top and end that delegate to the specific
-  // space type.
-  virtual HeapWord* top() const = 0;
-  virtual HeapWord* end() const = 0;
-
-  // Return true if q matches the mangled pattern.
-  static bool is_mangled(HeapWord* q) PRODUCT_RETURN0;
-
-  // Used to save the address in a space for later use during mangling.
-  void set_top_for_allocations(HeapWord* v);
-
-  // Overwrites the unused portion of this space.
-  // Mangle only the region not previously mangled [top, top_previously_mangled)
-  void mangle_unused_area();
-  // Mangle all the unused region [top, end)
-  void mangle_unused_area_complete();
-  // Do some sparse checking on the area that should have been mangled.
-  void check_mangled_unused_area(HeapWord* limit) PRODUCT_RETURN;
-  // Do a complete check of the area that should be mangled.
-  void check_mangled_unused_area_complete() PRODUCT_RETURN;
-
-  // Mangle the MemRegion.  This is a non-space specific mangler.  It
-  // is used during the initial mangling of a space before the space
-  // is fully constructed.  Also is used when a generation is expanded
-  // and possibly before the spaces have been reshaped to to the new
-  // size of the generation.
-  static void mangle_region(MemRegion mr) PRODUCT_RETURN;
-};
-
-class ContiguousSpace;
-class MutableSpace;
-
-// For use with SerialHeap's
-class GenSpaceMangler: public SpaceMangler {
-  ContiguousSpace* _sp;
-
-  ContiguousSpace* sp() { return _sp; }
-
-  HeapWord* top() const;
-  HeapWord* end() const;
-
- public:
-  GenSpaceMangler(ContiguousSpace* sp) : SpaceMangler(), _sp(sp) {}
-};
-
-// For use with ParallelScavengeHeap's.
-class MutableSpaceMangler: public SpaceMangler {
-  MutableSpace* _sp;
-
-  MutableSpace* sp() { return _sp; }
-
-  HeapWord* top() const;
-  HeapWord* end() const;
-
- public:
-  MutableSpaceMangler(MutableSpace* sp) : SpaceMangler(), _sp(sp) {}
+struct SpaceMangler : AllStatic {
+  static void mangle_region(MemRegion mr) NOT_DEBUG_RETURN;
 };
 
 #endif // SHARE_GC_SHARED_SPACEDECORATOR_HPP
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
index 14fb038a6c6..dbb45995698 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
@@ -463,6 +463,12 @@ void ShenandoahBarrierC2Support::verify(RootNode* root) {
         "decodeBlock",
         { { TypeFunc::Parms, ShenandoahLoad },  { TypeFunc::Parms+3, ShenandoahStore },   { -1, ShenandoahNone },
           { -1,  ShenandoahNone},                 { -1,  ShenandoahNone},                 { -1,  ShenandoahNone} },
+        "intpoly_montgomeryMult_P256",
+        { { TypeFunc::Parms, ShenandoahLoad },  { TypeFunc::Parms+1, ShenandoahLoad  },   { TypeFunc::Parms+2, ShenandoahStore },
+          { -1,  ShenandoahNone},                 { -1,  ShenandoahNone},                 { -1,  ShenandoahNone} },
+        "intpoly_assign",
+        { { TypeFunc::Parms+1, ShenandoahStore }, { TypeFunc::Parms+2, ShenandoahLoad },  { -1, ShenandoahNone },
+          { -1,  ShenandoahNone},                 { -1,  ShenandoahNone},                 { -1,  ShenandoahNone} },
       };
 
       if (call->is_call_to_arraycopystub()) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
index 72a3f411ea0..c11d7e814e4 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2016, 2021, Red Hat, Inc. All rights reserved.
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,82 +29,658 @@
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
 #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
+#include "gc/shenandoah/shenandoahSimpleBitMap.hpp"
+#include "gc/shenandoah/shenandoahSimpleBitMap.inline.hpp"
 #include "logging/logStream.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/orderAccess.hpp"
 
-ShenandoahFreeSet::ShenandoahFreeSet(ShenandoahHeap* heap, size_t max_regions) :
-  _heap(heap),
-  _mutator_free_bitmap(max_regions, mtGC),
-  _collector_free_bitmap(max_regions, mtGC),
-  _max(max_regions)
+static const char* partition_name(ShenandoahFreeSetPartitionId t) {
+  switch (t) {
+    case ShenandoahFreeSetPartitionId::NotFree: return "NotFree";
+    case ShenandoahFreeSetPartitionId::Mutator: return "Mutator";
+    case ShenandoahFreeSetPartitionId::Collector: return "Collector";
+    default:
+      ShouldNotReachHere();
+      return "Unrecognized";
+  }
+}
+
+#ifndef PRODUCT
+void ShenandoahRegionPartitions::dump_bitmap() const {
+  log_info(gc)("Mutator range [" SSIZE_FORMAT ", " SSIZE_FORMAT "], Collector range [" SSIZE_FORMAT ", " SSIZE_FORMAT "]",
+               _leftmosts[int(ShenandoahFreeSetPartitionId::Mutator)],
+               _rightmosts[int(ShenandoahFreeSetPartitionId::Mutator)],
+               _leftmosts[int(ShenandoahFreeSetPartitionId::Collector)],
+               _rightmosts[int(ShenandoahFreeSetPartitionId::Collector)]);
+  log_info(gc)("Empty Mutator range [" SSIZE_FORMAT ", " SSIZE_FORMAT
+               "], Empty Collector range [" SSIZE_FORMAT ", " SSIZE_FORMAT "]",
+               _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)],
+               _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)],
+               _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)],
+               _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)]);
+
+  log_info(gc)("%6s: %18s %18s %18s", "index", "Mutator Bits", "Collector Bits", "NotFree Bits");
+  dump_bitmap_range(0, _max-1);
+}
+
+void ShenandoahRegionPartitions::dump_bitmap_range(idx_t start_region_idx, idx_t end_region_idx) const {
+  assert((start_region_idx >= 0) && (start_region_idx < (idx_t) _max), "precondition");
+  assert((end_region_idx >= 0) && (end_region_idx < (idx_t) _max), "precondition");
+  idx_t aligned_start = _membership[int(ShenandoahFreeSetPartitionId::Mutator)].aligned_index(start_region_idx);
+  idx_t aligned_end = _membership[int(ShenandoahFreeSetPartitionId::Mutator)].aligned_index(end_region_idx);
+  idx_t alignment = _membership[int(ShenandoahFreeSetPartitionId::Mutator)].alignment();
+  while (aligned_start <= aligned_end) {
+    dump_bitmap_row(aligned_start);
+    aligned_start += alignment;
+  }
+}
+
+void ShenandoahRegionPartitions::dump_bitmap_row(idx_t region_idx) const {
+  assert((region_idx >= 0) && (region_idx < (idx_t) _max), "precondition");
+  idx_t aligned_idx = _membership[int(ShenandoahFreeSetPartitionId::Mutator)].aligned_index(region_idx);
+  uintx mutator_bits = _membership[int(ShenandoahFreeSetPartitionId::Mutator)].bits_at(aligned_idx);
+  uintx collector_bits = _membership[int(ShenandoahFreeSetPartitionId::Collector)].bits_at(aligned_idx);
+  uintx free_bits = mutator_bits | collector_bits;
+  uintx notfree_bits =  ~free_bits;
+  log_info(gc)(SSIZE_FORMAT_W(6) ": " SIZE_FORMAT_X_0 " 0x" SIZE_FORMAT_X_0 " 0x" SIZE_FORMAT_X_0,
+               aligned_idx, mutator_bits, collector_bits, notfree_bits);
+}
+#endif
+
+ShenandoahRegionPartitions::ShenandoahRegionPartitions(size_t max_regions, ShenandoahFreeSet* free_set) :
+    _max(max_regions),
+    _region_size_bytes(ShenandoahHeapRegion::region_size_bytes()),
+    _free_set(free_set),
+    _membership{ ShenandoahSimpleBitMap(max_regions), ShenandoahSimpleBitMap(max_regions) }
 {
-  clear_internal();
+  make_all_regions_unavailable();
 }
 
-void ShenandoahFreeSet::increase_used(size_t num_bytes) {
-  shenandoah_assert_heaplocked();
-  _used += num_bytes;
+inline bool ShenandoahFreeSet::can_allocate_from(ShenandoahHeapRegion *r) const {
+  return r->is_empty() || (r->is_trash() && !_heap->is_concurrent_weak_root_in_progress());
+}
+
+inline bool ShenandoahFreeSet::can_allocate_from(size_t idx) const {
+  ShenandoahHeapRegion* r = _heap->get_region(idx);
+  return can_allocate_from(r);
+}
+
+inline size_t ShenandoahFreeSet::alloc_capacity(ShenandoahHeapRegion *r) const {
+  if (r->is_trash()) {
+    // This would be recycled on allocation path
+    return ShenandoahHeapRegion::region_size_bytes();
+  } else {
+    return r->free();
+  }
+}
+
+inline size_t ShenandoahFreeSet::alloc_capacity(size_t idx) const {
+  ShenandoahHeapRegion* r = _heap->get_region(idx);
+  return alloc_capacity(r);
+}
+
+inline bool ShenandoahFreeSet::has_alloc_capacity(ShenandoahHeapRegion *r) const {
+  return alloc_capacity(r) > 0;
+}
+
+inline idx_t ShenandoahRegionPartitions::leftmost(ShenandoahFreeSetPartitionId which_partition) const {
+  assert (which_partition < NumPartitions, "selected free partition must be valid");
+  idx_t idx = _leftmosts[int(which_partition)];
+  if (idx >= _max) {
+    return _max;
+  } else {
+    // Cannot assert that membership[which_partition.is_set(idx) because this helper method may be used
+    // to query the original value of leftmost when leftmost must be adjusted because the interval representing
+    // which_partition is shrinking after the region that used to be leftmost is retired.
+    return idx;
+  }
+}
+
+inline idx_t ShenandoahRegionPartitions::rightmost(ShenandoahFreeSetPartitionId which_partition) const {
+  assert (which_partition < NumPartitions, "selected free partition must be valid");
+  idx_t idx = _rightmosts[int(which_partition)];
+  // Cannot assert that membership[which_partition.is_set(idx) because this helper method may be used
+  // to query the original value of leftmost when leftmost must be adjusted because the interval representing
+  // which_partition is shrinking after the region that used to be leftmost is retired.
+  return idx;
+}
+
+void ShenandoahRegionPartitions::make_all_regions_unavailable() {
+  for (size_t partition_id = 0; partition_id < IntNumPartitions; partition_id++) {
+    _membership[partition_id].clear_all();
+    _leftmosts[partition_id] = _max;
+    _rightmosts[partition_id] = -1;
+    _leftmosts_empty[partition_id] = _max;
+    _rightmosts_empty[partition_id] = -1;;
+    _capacity[partition_id] = 0;
+    _used[partition_id] = 0;
+  }
+  _region_counts[int(ShenandoahFreeSetPartitionId::Mutator)] = _region_counts[int(ShenandoahFreeSetPartitionId::Collector)] = 0;
+}
 
-  assert(_used <= _capacity, "must not use more than we have: used: " SIZE_FORMAT
-         ", capacity: " SIZE_FORMAT ", num_bytes: " SIZE_FORMAT, _used, _capacity, num_bytes);
+void ShenandoahRegionPartitions::establish_mutator_intervals(idx_t mutator_leftmost, idx_t mutator_rightmost,
+                                                             idx_t mutator_leftmost_empty, idx_t mutator_rightmost_empty,
+                                                             size_t mutator_region_count, size_t mutator_used) {
+  _region_counts[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_region_count;
+  _leftmosts[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_leftmost;
+  _rightmosts[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_rightmost;
+  _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_leftmost_empty;
+  _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_rightmost_empty;
+
+  _region_counts[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_region_count;
+  _used[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_used;
+  _capacity[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_region_count * _region_size_bytes;
+
+  _leftmosts[int(ShenandoahFreeSetPartitionId::Collector)] = _max;
+  _rightmosts[int(ShenandoahFreeSetPartitionId::Collector)] = -1;
+  _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)] = _max;
+  _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)] = -1;
+
+  _region_counts[int(ShenandoahFreeSetPartitionId::Collector)] = 0;
+  _used[int(ShenandoahFreeSetPartitionId::Collector)] = 0;
+  _capacity[int(ShenandoahFreeSetPartitionId::Collector)] = 0;
 }
 
-bool ShenandoahFreeSet::is_mutator_free(size_t idx) const {
-  assert (idx < _max, "index is sane: " SIZE_FORMAT " < " SIZE_FORMAT " (left: " SIZE_FORMAT ", right: " SIZE_FORMAT ")",
-          idx, _max, _mutator_leftmost, _mutator_rightmost);
-  return _mutator_free_bitmap.at(idx);
+void ShenandoahRegionPartitions::increase_used(ShenandoahFreeSetPartitionId which_partition, size_t bytes) {
+  assert (which_partition < NumPartitions, "Partition must be valid");
+  _used[int(which_partition)] += bytes;
+  assert (_used[int(which_partition)] <= _capacity[int(which_partition)],
+          "Must not use (" SIZE_FORMAT ") more than capacity (" SIZE_FORMAT ") after increase by " SIZE_FORMAT,
+          _used[int(which_partition)], _capacity[int(which_partition)], bytes);
 }
 
-bool ShenandoahFreeSet::is_collector_free(size_t idx) const {
-  assert (idx < _max, "index is sane: " SIZE_FORMAT " < " SIZE_FORMAT " (left: " SIZE_FORMAT ", right: " SIZE_FORMAT ")",
-          idx, _max, _collector_leftmost, _collector_rightmost);
-  return _collector_free_bitmap.at(idx);
+inline void ShenandoahRegionPartitions::shrink_interval_if_range_modifies_either_boundary(
+  ShenandoahFreeSetPartitionId partition, idx_t low_idx, idx_t high_idx) {
+  assert((low_idx <= high_idx) && (low_idx >= 0) && (high_idx < _max), "Range must span legal index values");
+  if (low_idx == leftmost(partition)) {
+    assert (!_membership[int(partition)].is_set(low_idx), "Do not shrink interval if region not removed");
+    if (high_idx + 1 == _max) {
+      _leftmosts[int(partition)] = _max;
+    } else {
+      _leftmosts[int(partition)] = find_index_of_next_available_region(partition, high_idx + 1);
+    }
+    if (_leftmosts_empty[int(partition)] < _leftmosts[int(partition)]) {
+      // This gets us closer to where we need to be; we'll scan further when leftmosts_empty is requested.
+      _leftmosts_empty[int(partition)] = leftmost(partition);
+    }
+  }
+  if (high_idx == _rightmosts[int(partition)]) {
+    assert (!_membership[int(partition)].is_set(high_idx), "Do not shrink interval if region not removed");
+    if (low_idx == 0) {
+      _rightmosts[int(partition)] = -1;
+    } else {
+      _rightmosts[int(partition)] = find_index_of_previous_available_region(partition, low_idx - 1);
+    }
+    if (_rightmosts_empty[int(partition)] > _rightmosts[int(partition)]) {
+      // This gets us closer to where we need to be; we'll scan further when rightmosts_empty is requested.
+      _rightmosts_empty[int(partition)] = _rightmosts[int(partition)];
+    }
+  }
+  if (_leftmosts[int(partition)] > _rightmosts[int(partition)]) {
+    _leftmosts[int(partition)] = _max;
+    _rightmosts[int(partition)] = -1;
+    _leftmosts_empty[int(partition)] = _max;
+    _rightmosts_empty[int(partition)] = -1;
+  }
+}
+
+inline void ShenandoahRegionPartitions::shrink_interval_if_boundary_modified(ShenandoahFreeSetPartitionId partition, idx_t idx) {
+  shrink_interval_if_range_modifies_either_boundary(partition, idx, idx);
+}
+
+inline void ShenandoahRegionPartitions::expand_interval_if_boundary_modified(ShenandoahFreeSetPartitionId partition,
+                                                                             idx_t idx, size_t region_available) {
+  if (_leftmosts[int(partition)] > idx) {
+    _leftmosts[int(partition)] = idx;
+  }
+  if (_rightmosts[int(partition)] < idx) {
+    _rightmosts[int(partition)] = idx;
+  }
+  if (region_available == _region_size_bytes) {
+    if (_leftmosts_empty[int(partition)] > idx) {
+      _leftmosts_empty[int(partition)] = idx;
+    }
+    if (_rightmosts_empty[int(partition)] < idx) {
+      _rightmosts_empty[int(partition)] = idx;
+    }
+  }
+}
+
+void ShenandoahRegionPartitions::retire_range_from_partition(
+  ShenandoahFreeSetPartitionId partition, idx_t low_idx, idx_t high_idx) {
+
+  // Note: we may remove from free partition even if region is not entirely full, such as when available < PLAB::min_size()
+  assert ((low_idx < _max) && (high_idx < _max), "Both indices are sane: " SIZE_FORMAT " and " SIZE_FORMAT " < " SIZE_FORMAT,
+          low_idx, high_idx, _max);
+  assert (partition < NumPartitions, "Cannot remove from free partitions if not already free");
+
+  for (idx_t idx = low_idx; idx <= high_idx; idx++) {
+    assert (in_free_set(partition, idx), "Must be in partition to remove from partition");
+    _membership[int(partition)].clear_bit(idx);
+  }
+  _region_counts[int(partition)] -= high_idx + 1 - low_idx;
+  shrink_interval_if_range_modifies_either_boundary(partition, low_idx, high_idx);
+}
+
+void ShenandoahRegionPartitions::retire_from_partition(ShenandoahFreeSetPartitionId partition, idx_t idx, size_t used_bytes) {
+
+  // Note: we may remove from free partition even if region is not entirely full, such as when available < PLAB::min_size()
+  assert (idx < _max, "index is sane: " SIZE_FORMAT " < " SIZE_FORMAT, idx, _max);
+  assert (partition < NumPartitions, "Cannot remove from free partitions if not already free");
+  assert (in_free_set(partition, idx), "Must be in partition to remove from partition");
+
+  if (used_bytes < _region_size_bytes) {
+    // Count the alignment pad remnant of memory as used when we retire this region
+    increase_used(partition, _region_size_bytes - used_bytes);
+  }
+  _membership[int(partition)].clear_bit(idx);
+  shrink_interval_if_boundary_modified(partition, idx);
+  _region_counts[int(partition)]--;
+}
+
+void ShenandoahRegionPartitions::make_free(idx_t idx, ShenandoahFreeSetPartitionId which_partition, size_t available) {
+  assert (idx < _max, "index is sane: " SIZE_FORMAT " < " SIZE_FORMAT, idx, _max);
+  assert (membership(idx) == ShenandoahFreeSetPartitionId::NotFree, "Cannot make free if already free");
+  assert (which_partition < NumPartitions, "selected free partition must be valid");
+  assert (available <= _region_size_bytes, "Available cannot exceed region size");
+
+  _membership[int(which_partition)].set_bit(idx);
+  _capacity[int(which_partition)] += _region_size_bytes;
+  _used[int(which_partition)] += _region_size_bytes - available;
+  expand_interval_if_boundary_modified(which_partition, idx, available);
+
+  _region_counts[int(which_partition)]++;
+}
+
+void ShenandoahRegionPartitions::move_from_partition_to_partition(idx_t idx, ShenandoahFreeSetPartitionId orig_partition,
+                                                                  ShenandoahFreeSetPartitionId new_partition, size_t available) {
+  assert (idx < _max, "index is sane: " SIZE_FORMAT " < " SIZE_FORMAT, idx, _max);
+  assert (orig_partition < NumPartitions, "Original partition must be valid");
+  assert (new_partition < NumPartitions, "New partition must be valid");
+  assert (available <= _region_size_bytes, "Available cannot exceed region size");
+
+  // Expected transitions:
+  //  During rebuild:         Mutator => Collector
+  //  During flip_to_gc:      Mutator empty => Collector
+  // At start of update refs: Collector => Mutator
+  assert (((available <= _region_size_bytes) &&
+           (((orig_partition == ShenandoahFreeSetPartitionId::Mutator)
+             && (new_partition == ShenandoahFreeSetPartitionId::Collector)) ||
+            ((orig_partition == ShenandoahFreeSetPartitionId::Collector)
+             && (new_partition == ShenandoahFreeSetPartitionId::Mutator)))) ||
+          ((available == _region_size_bytes) &&
+           ((orig_partition == ShenandoahFreeSetPartitionId::Mutator)
+            && (new_partition == ShenandoahFreeSetPartitionId::Collector))), "Unexpected movement between partitions");
+
+  size_t used = _region_size_bytes - available;
+
+  _membership[int(orig_partition)].clear_bit(idx);
+  _membership[int(new_partition)].set_bit(idx);
+
+  _capacity[int(orig_partition)] -= _region_size_bytes;
+  _used[int(orig_partition)] -= used;
+  shrink_interval_if_boundary_modified(orig_partition, idx);
+
+  _capacity[int(new_partition)] += _region_size_bytes;;
+  _used[int(new_partition)] += used;
+  expand_interval_if_boundary_modified(new_partition, idx, available);
+
+  _region_counts[int(orig_partition)]--;
+  _region_counts[int(new_partition)]++;
+}
+
+const char* ShenandoahRegionPartitions::partition_membership_name(idx_t idx) const {
+  return partition_name(membership(idx));
+}
+
+inline ShenandoahFreeSetPartitionId ShenandoahRegionPartitions::membership(idx_t idx) const {
+  assert (idx < _max, "index is sane: " SIZE_FORMAT " < " SIZE_FORMAT, idx, _max);
+  ShenandoahFreeSetPartitionId result = ShenandoahFreeSetPartitionId::NotFree;
+  for (uint partition_id = 0; partition_id < UIntNumPartitions; partition_id++) {
+    if (_membership[partition_id].is_set(idx)) {
+      assert(result == ShenandoahFreeSetPartitionId::NotFree, "Region should reside in only one partition");
+      result = (ShenandoahFreeSetPartitionId) partition_id;
+    }
+  }
+  return result;
+}
+
+#ifdef ASSERT
+inline bool ShenandoahRegionPartitions::partition_id_matches(idx_t idx, ShenandoahFreeSetPartitionId test_partition) const {
+  assert (idx < _max, "index is sane: " SIZE_FORMAT " < " SIZE_FORMAT, idx, _max);
+  assert (test_partition < ShenandoahFreeSetPartitionId::NotFree, "must be a valid partition");
+
+  return membership(idx) == test_partition;
+}
+#endif
+
+inline bool ShenandoahRegionPartitions::is_empty(ShenandoahFreeSetPartitionId which_partition) const {
+  assert (which_partition < NumPartitions, "selected free partition must be valid");
+  return (leftmost(which_partition) > rightmost(which_partition));
+}
+
+inline idx_t ShenandoahRegionPartitions::find_index_of_next_available_region(
+  ShenandoahFreeSetPartitionId which_partition, idx_t start_index) const {
+  idx_t rightmost_idx = rightmost(which_partition);
+  idx_t leftmost_idx = leftmost(which_partition);
+  if ((rightmost_idx < leftmost_idx) || (start_index > rightmost_idx)) return _max;
+  if (start_index < leftmost_idx) {
+    start_index = leftmost_idx;
+  }
+  idx_t result = _membership[int(which_partition)].find_first_set_bit(start_index, rightmost_idx + 1);
+  if (result > rightmost_idx) {
+    result = _max;
+  }
+  assert (result >= start_index, "Requires progress");
+  return result;
+}
+
+inline idx_t ShenandoahRegionPartitions::find_index_of_previous_available_region(
+  ShenandoahFreeSetPartitionId which_partition, idx_t last_index) const {
+  idx_t rightmost_idx = rightmost(which_partition);
+  idx_t leftmost_idx = leftmost(which_partition);
+  // if (leftmost_idx == max) then (last_index < leftmost_idx)
+  if (last_index < leftmost_idx) return -1;
+  if (last_index > rightmost_idx) {
+    last_index = rightmost_idx;
+  }
+  idx_t result = _membership[int(which_partition)].find_last_set_bit(-1, last_index);
+  if (result < leftmost_idx) {
+    result = -1;
+  }
+  assert (result <= last_index, "Requires progress");
+  return result;
+}
+
+inline idx_t ShenandoahRegionPartitions::find_index_of_next_available_cluster_of_regions(
+  ShenandoahFreeSetPartitionId which_partition, idx_t start_index, size_t cluster_size) const {
+  idx_t rightmost_idx = rightmost(which_partition);
+  idx_t leftmost_idx = leftmost(which_partition);
+  if ((rightmost_idx < leftmost_idx) || (start_index > rightmost_idx)) return _max;
+  idx_t result = _membership[int(which_partition)].find_first_consecutive_set_bits(start_index, rightmost_idx + 1, cluster_size);
+  if (result > rightmost_idx) {
+    result = _max;
+  }
+  assert (result >= start_index, "Requires progress");
+  return result;
+}
+
+inline idx_t ShenandoahRegionPartitions::find_index_of_previous_available_cluster_of_regions(
+  ShenandoahFreeSetPartitionId which_partition, idx_t last_index, size_t cluster_size) const {
+  idx_t leftmost_idx = leftmost(which_partition);
+  // if (leftmost_idx == max) then (last_index < leftmost_idx)
+  if (last_index < leftmost_idx) return -1;
+  idx_t result = _membership[int(which_partition)].find_last_consecutive_set_bits(leftmost_idx - 1, last_index, cluster_size);
+  if (result <= leftmost_idx) {
+    result = -1;
+  }
+  assert (result <= last_index, "Requires progress");
+  return result;
+}
+
+idx_t ShenandoahRegionPartitions::leftmost_empty(ShenandoahFreeSetPartitionId which_partition) {
+  assert (which_partition < NumPartitions, "selected free partition must be valid");
+  idx_t max_regions = _max;
+  if (_leftmosts_empty[int(which_partition)] == _max) {
+    return _max;
+  }
+  for (idx_t idx = find_index_of_next_available_region(which_partition, _leftmosts_empty[int(which_partition)]);
+       idx < max_regions; ) {
+    assert(in_free_set(which_partition, idx), "Boundaries or find_last_set_bit failed: " SSIZE_FORMAT, idx);
+    if (_free_set->alloc_capacity(idx) == _region_size_bytes) {
+      _leftmosts_empty[int(which_partition)] = idx;
+      return idx;
+    }
+    idx = find_index_of_next_available_region(which_partition, idx + 1);
+  }
+  _leftmosts_empty[int(which_partition)] = _max;
+  _rightmosts_empty[int(which_partition)] = -1;
+  return _max;
+}
+
+idx_t ShenandoahRegionPartitions::rightmost_empty(ShenandoahFreeSetPartitionId which_partition) {
+  assert (which_partition < NumPartitions, "selected free partition must be valid");
+  if (_rightmosts_empty[int(which_partition)] < 0) {
+    return -1;
+  }
+  for (idx_t idx = find_index_of_previous_available_region(which_partition, _rightmosts_empty[int(which_partition)]);
+       idx >= 0; ) {
+    assert(in_free_set(which_partition, idx), "Boundaries or find_last_set_bit failed: " SSIZE_FORMAT, idx);
+    if (_free_set->alloc_capacity(idx) == _region_size_bytes) {
+      _rightmosts_empty[int(which_partition)] = idx;
+      return idx;
+    }
+    idx = find_index_of_previous_available_region(which_partition, idx - 1);
+  }
+  _leftmosts_empty[int(which_partition)] = _max;
+  _rightmosts_empty[int(which_partition)] = -1;
+  return -1;
+}
+
+
+#ifdef ASSERT
+void ShenandoahRegionPartitions::assert_bounds() {
+
+  idx_t leftmosts[UIntNumPartitions];
+  idx_t rightmosts[UIntNumPartitions];
+  idx_t empty_leftmosts[UIntNumPartitions];
+  idx_t empty_rightmosts[UIntNumPartitions];
+
+  for (uint i = 0; i < UIntNumPartitions; i++) {
+    leftmosts[i] = _max;
+    empty_leftmosts[i] = _max;
+    rightmosts[i] = -1;
+    empty_rightmosts[i] = -1;
+  }
+
+  for (idx_t i = 0; i < _max; i++) {
+    ShenandoahFreeSetPartitionId partition = membership(i);
+    switch (partition) {
+      case ShenandoahFreeSetPartitionId::NotFree:
+        break;
+
+      case ShenandoahFreeSetPartitionId::Mutator:
+      case ShenandoahFreeSetPartitionId::Collector:
+      {
+        size_t capacity = _free_set->alloc_capacity(i);
+        bool is_empty = (capacity == _region_size_bytes);
+        assert(capacity > 0, "free regions must have allocation capacity");
+        if (i < leftmosts[int(partition)]) {
+          leftmosts[int(partition)] = i;
+        }
+        if (is_empty && (i < empty_leftmosts[int(partition)])) {
+          empty_leftmosts[int(partition)] = i;
+        }
+        if (i > rightmosts[int(partition)]) {
+          rightmosts[int(partition)] = i;
+        }
+        if (is_empty && (i > empty_rightmosts[int(partition)])) {
+          empty_rightmosts[int(partition)] = i;
+        }
+        break;
+      }
+
+      default:
+        ShouldNotReachHere();
+    }
+  }
+
+  // Performance invariants. Failing these would not break the free partition, but performance would suffer.
+  assert (leftmost(ShenandoahFreeSetPartitionId::Mutator) <= _max,
+          "leftmost in bounds: "  SSIZE_FORMAT " < " SSIZE_FORMAT, leftmost(ShenandoahFreeSetPartitionId::Mutator),  _max);
+  assert (rightmost(ShenandoahFreeSetPartitionId::Mutator) < _max,
+          "rightmost in bounds: "  SSIZE_FORMAT " < " SSIZE_FORMAT, rightmost(ShenandoahFreeSetPartitionId::Mutator),  _max);
+
+  assert (leftmost(ShenandoahFreeSetPartitionId::Mutator) == _max
+          || partition_id_matches(leftmost(ShenandoahFreeSetPartitionId::Mutator), ShenandoahFreeSetPartitionId::Mutator),
+          "leftmost region should be free: " SSIZE_FORMAT,  leftmost(ShenandoahFreeSetPartitionId::Mutator));
+  assert (leftmost(ShenandoahFreeSetPartitionId::Mutator) == _max
+          || partition_id_matches(rightmost(ShenandoahFreeSetPartitionId::Mutator), ShenandoahFreeSetPartitionId::Mutator),
+          "rightmost region should be free: " SSIZE_FORMAT, rightmost(ShenandoahFreeSetPartitionId::Mutator));
+
+  // If Mutator partition is empty, leftmosts will both equal max, rightmosts will both equal zero.
+  // Likewise for empty region partitions.
+  idx_t beg_off = leftmosts[int(ShenandoahFreeSetPartitionId::Mutator)];
+  idx_t end_off = rightmosts[int(ShenandoahFreeSetPartitionId::Mutator)];
+  assert (beg_off >= leftmost(ShenandoahFreeSetPartitionId::Mutator),
+          "free regions before the leftmost: " SSIZE_FORMAT ", bound " SSIZE_FORMAT,
+          beg_off, leftmost(ShenandoahFreeSetPartitionId::Mutator));
+  assert (end_off <= rightmost(ShenandoahFreeSetPartitionId::Mutator),
+          "free regions past the rightmost: " SSIZE_FORMAT ", bound " SSIZE_FORMAT,
+          end_off, rightmost(ShenandoahFreeSetPartitionId::Mutator));
+
+  beg_off = empty_leftmosts[int(ShenandoahFreeSetPartitionId::Mutator)];
+  end_off = empty_rightmosts[int(ShenandoahFreeSetPartitionId::Mutator)];
+  assert (beg_off >= leftmost_empty(ShenandoahFreeSetPartitionId::Mutator),
+          "free empty regions before the leftmost: " SSIZE_FORMAT ", bound " SSIZE_FORMAT,
+          beg_off, leftmost_empty(ShenandoahFreeSetPartitionId::Mutator));
+  assert (end_off <= rightmost_empty(ShenandoahFreeSetPartitionId::Mutator),
+          "free empty regions past the rightmost: " SSIZE_FORMAT ", bound " SSIZE_FORMAT,
+          end_off, rightmost_empty(ShenandoahFreeSetPartitionId::Mutator));
+
+  // Performance invariants. Failing these would not break the free partition, but performance would suffer.
+  assert (leftmost(ShenandoahFreeSetPartitionId::Collector) <= _max, "leftmost in bounds: "  SSIZE_FORMAT " < " SSIZE_FORMAT,
+          leftmost(ShenandoahFreeSetPartitionId::Collector),  _max);
+  assert (rightmost(ShenandoahFreeSetPartitionId::Collector) < _max, "rightmost in bounds: "  SSIZE_FORMAT " < " SSIZE_FORMAT,
+          rightmost(ShenandoahFreeSetPartitionId::Collector),  _max);
+
+  assert (leftmost(ShenandoahFreeSetPartitionId::Collector) == _max
+          || partition_id_matches(leftmost(ShenandoahFreeSetPartitionId::Collector), ShenandoahFreeSetPartitionId::Collector),
+          "leftmost region should be free: " SSIZE_FORMAT,  leftmost(ShenandoahFreeSetPartitionId::Collector));
+  assert (leftmost(ShenandoahFreeSetPartitionId::Collector) == _max
+          || partition_id_matches(rightmost(ShenandoahFreeSetPartitionId::Collector), ShenandoahFreeSetPartitionId::Collector),
+          "rightmost region should be free: " SSIZE_FORMAT, rightmost(ShenandoahFreeSetPartitionId::Collector));
+
+  // If Collector partition is empty, leftmosts will both equal max, rightmosts will both equal zero.
+  // Likewise for empty region partitions.
+  beg_off = leftmosts[int(ShenandoahFreeSetPartitionId::Collector)];
+  end_off = rightmosts[int(ShenandoahFreeSetPartitionId::Collector)];
+  assert (beg_off >= leftmost(ShenandoahFreeSetPartitionId::Collector),
+          "free regions before the leftmost: " SSIZE_FORMAT ", bound " SSIZE_FORMAT,
+          beg_off, leftmost(ShenandoahFreeSetPartitionId::Collector));
+  assert (end_off <= rightmost(ShenandoahFreeSetPartitionId::Collector),
+          "free regions past the rightmost: " SSIZE_FORMAT ", bound " SSIZE_FORMAT,
+          end_off, rightmost(ShenandoahFreeSetPartitionId::Collector));
+
+  beg_off = empty_leftmosts[int(ShenandoahFreeSetPartitionId::Collector)];
+  end_off = empty_rightmosts[int(ShenandoahFreeSetPartitionId::Collector)];
+  assert (beg_off >= _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)],
+          "free empty regions before the leftmost: " SSIZE_FORMAT ", bound " SSIZE_FORMAT,
+          beg_off, leftmost_empty(ShenandoahFreeSetPartitionId::Collector));
+  assert (end_off <= _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)],
+          "free empty regions past the rightmost: " SSIZE_FORMAT ", bound " SSIZE_FORMAT,
+          end_off, rightmost_empty(ShenandoahFreeSetPartitionId::Collector));
+}
+#endif
+
+ShenandoahFreeSet::ShenandoahFreeSet(ShenandoahHeap* heap, size_t max_regions) :
+  _heap(heap),
+  _partitions(max_regions, this),
+  _right_to_left_bias(false),
+  _alloc_bias_weight(0)
+{
+  clear_internal();
 }
 
 HeapWord* ShenandoahFreeSet::allocate_single(ShenandoahAllocRequest& req, bool& in_new_region) {
+  shenandoah_assert_heaplocked();
+
   // Scan the bitmap looking for a first fit.
   //
-  // Leftmost and rightmost bounds provide enough caching to walk bitmap efficiently. Normally,
-  // we would find the region to allocate at right away.
+  // Leftmost and rightmost bounds provide enough caching to quickly find a region from which to allocate.
   //
-  // Allocations are biased: new application allocs go to beginning of the heap, and GC allocs
-  // go to the end. This makes application allocation faster, because we would clear lots
-  // of regions from the beginning most of the time.
+  // Allocations are biased: GC allocations are taken from the high end of the heap.  Regular (and TLAB)
+  // mutator allocations are taken from the middle of heap, below the memory reserved for Collector.
+  // Humongous mutator allocations are taken from the bottom of the heap.
   //
-  // Free set maintains mutator and collector views, and normally they allocate in their views only,
-  // unless we special cases for stealing and mixed allocations.
+  // Free set maintains mutator and collector partitions.  Mutator can only allocate from the
+  // Mutator partition.  Collector prefers to allocate from the Collector partition, but may steal
+  // regions from the Mutator partition if the Collector partition has been depleted.
 
   switch (req.type()) {
     case ShenandoahAllocRequest::_alloc_tlab:
     case ShenandoahAllocRequest::_alloc_shared: {
-
       // Try to allocate in the mutator view
-      for (size_t idx = _mutator_leftmost; idx <= _mutator_rightmost; idx++) {
-        if (is_mutator_free(idx)) {
-          HeapWord* result = try_allocate_in(_heap->get_region(idx), req, in_new_region);
-          if (result != nullptr) {
-            return result;
+      if (_alloc_bias_weight-- <= 0) {
+        // We have observed that regions not collected in previous GC cycle tend to congregate at one end or the other
+        // of the heap.  Typically, these are the more recently engaged regions and the objects in these regions have not
+        // yet had a chance to die (and/or are treated as floating garbage).  If we use the same allocation bias on each
+        // GC pass, these "most recently" engaged regions for GC pass N will also be the "most recently" engaged regions
+        // for GC pass N+1, and the relatively large amount of live data and/or floating garbage introduced
+        // during the most recent GC pass may once again prevent the region from being collected.  We have found that
+        // alternating the allocation behavior between GC passes improves evacuation performance by 3-7% on certain
+        // benchmarks.  In the best case, this has the effect of consuming these partially consumed regions before
+        // the start of the next mark cycle so all of their garbage can be efficiently reclaimed.
+        //
+        // First, finish consuming regions that are already partially consumed so as to more tightly limit ranges of
+        // available regions.  Other potential benefits:
+        //  1. Eventual collection set has fewer regions because we have packed newly allocated objects into fewer regions
+        //  2. We preserve the "empty" regions longer into the GC cycle, reducing likelihood of allocation failures
+        //     late in the GC cycle.
+        idx_t non_empty_on_left = (_partitions.leftmost_empty(ShenandoahFreeSetPartitionId::Mutator)
+                                     - _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator));
+        idx_t non_empty_on_right = (_partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator)
+                                      - _partitions.rightmost_empty(ShenandoahFreeSetPartitionId::Mutator));
+        _right_to_left_bias = (non_empty_on_right > non_empty_on_left);
+        _alloc_bias_weight = _InitialAllocBiasWeight;
+      }
+      if (_right_to_left_bias) {
+        // Allocate within mutator free from high memory to low so as to preserve low memory for humongous allocations
+        if (!_partitions.is_empty(ShenandoahFreeSetPartitionId::Mutator)) {
+          // Use signed idx.  Otherwise, loop will never terminate.
+          idx_t leftmost = _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator);
+          for (idx_t idx = _partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator); idx >= leftmost; ) {
+            assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, idx),
+                   "Boundaries or find_last_set_bit failed: " SSIZE_FORMAT, idx);
+            ShenandoahHeapRegion* r = _heap->get_region(idx);
+            // try_allocate_in() increases used if the allocation is successful.
+            HeapWord* result;
+            size_t min_size = (req.type() == ShenandoahAllocRequest::_alloc_tlab)? req.min_size(): req.size();
+            if ((alloc_capacity(r) >= min_size) && ((result = try_allocate_in(r, req, in_new_region)) != nullptr)) {
+              return result;
+            }
+            idx = _partitions.find_index_of_previous_available_region(ShenandoahFreeSetPartitionId::Mutator, idx - 1);
+          }
+        }
+      } else {
+        // Allocate from low to high memory.  This keeps the range of fully empty regions more tightly packed.
+        // Note that the most recently allocated regions tend not to be evacuated in a given GC cycle.  So this
+        // tends to accumulate "fragmented" uncollected regions in high memory.
+        if (!_partitions.is_empty(ShenandoahFreeSetPartitionId::Mutator)) {
+          // Use signed idx.  Otherwise, loop will never terminate.
+          idx_t rightmost = _partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator);
+          for (idx_t idx = _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator); idx <= rightmost; ) {
+            assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, idx),
+                   "Boundaries or find_last_set_bit failed: " SSIZE_FORMAT, idx);
+            ShenandoahHeapRegion* r = _heap->get_region(idx);
+            // try_allocate_in() increases used if the allocation is successful.
+            HeapWord* result;
+            size_t min_size = (req.type() == ShenandoahAllocRequest::_alloc_tlab)? req.min_size(): req.size();
+            if ((alloc_capacity(r) >= min_size) && ((result = try_allocate_in(r, req, in_new_region)) != nullptr)) {
+              return result;
+            }
+            idx = _partitions.find_index_of_next_available_region(ShenandoahFreeSetPartitionId::Mutator, idx + 1);
           }
         }
       }
-
       // There is no recovery. Mutator does not touch collector view at all.
       break;
     }
     case ShenandoahAllocRequest::_alloc_gclab:
-    case ShenandoahAllocRequest::_alloc_shared_gc: {
-      // size_t is unsigned, need to dodge underflow when _leftmost = 0
+      // GCLABs are for evacuation so we must be in evacuation phase.
 
+    case ShenandoahAllocRequest::_alloc_shared_gc: {
       // Fast-path: try to allocate in the collector view first
-      for (size_t c = _collector_rightmost + 1; c > _collector_leftmost; c--) {
-        size_t idx = c - 1;
-        if (is_collector_free(idx)) {
-          HeapWord* result = try_allocate_in(_heap->get_region(idx), req, in_new_region);
-          if (result != nullptr) {
-            return result;
-          }
+      idx_t leftmost_collector = _partitions.leftmost(ShenandoahFreeSetPartitionId::Collector);
+      for (idx_t idx = _partitions.rightmost(ShenandoahFreeSetPartitionId::Collector); idx >= leftmost_collector; ) {
+        assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Collector, idx),
+               "Boundaries or find_prev_last_bit failed: " SSIZE_FORMAT, idx);
+        HeapWord* result = try_allocate_in(_heap->get_region(idx), req, in_new_region);
+        if (result != nullptr) {
+          return result;
         }
+        idx = _partitions.find_index_of_previous_available_region(ShenandoahFreeSetPartitionId::Collector, idx - 1);
       }
 
       // No dice. Can we borrow space from mutator view?
@@ -111,166 +688,166 @@ HeapWord* ShenandoahFreeSet::allocate_single(ShenandoahAllocRequest& req, bool&
         return nullptr;
       }
 
-      // Try to steal the empty region from the mutator view
-      for (size_t c = _mutator_rightmost + 1; c > _mutator_leftmost; c--) {
-        size_t idx = c - 1;
-        if (is_mutator_free(idx)) {
-          ShenandoahHeapRegion* r = _heap->get_region(idx);
-          if (can_allocate_from(r)) {
-            flip_to_gc(r);
-            HeapWord *result = try_allocate_in(r, req, in_new_region);
-            if (result != nullptr) {
-              return result;
-            }
+      // Try to steal an empty region from the mutator view.
+      idx_t leftmost_mutator_empty = _partitions.leftmost_empty(ShenandoahFreeSetPartitionId::Mutator);
+      for (idx_t idx = _partitions.rightmost_empty(ShenandoahFreeSetPartitionId::Mutator); idx >= leftmost_mutator_empty; ) {
+        assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, idx),
+               "Boundaries or find_prev_last_bit failed: " SSIZE_FORMAT, idx);
+        ShenandoahHeapRegion* r = _heap->get_region(idx);
+        if (can_allocate_from(r)) {
+          flip_to_gc(r);
+          HeapWord *result = try_allocate_in(r, req, in_new_region);
+          if (result != nullptr) {
+            log_debug(gc)("Flipped region " SIZE_FORMAT " to gc for request: " PTR_FORMAT, idx, p2i(&req));
+            return result;
           }
         }
+        idx = _partitions.find_index_of_previous_available_region(ShenandoahFreeSetPartitionId::Mutator, idx - 1);
       }
 
-      // No dice. Do not try to mix mutator and GC allocations, because
-      // URWM moves due to GC allocations would expose unparsable mutator
-      // allocations.
-
+      // No dice. Do not try to mix mutator and GC allocations, because adjusting region UWM
+      // due to GC allocations would expose unparsable mutator allocations.
       break;
     }
     default:
       ShouldNotReachHere();
   }
-
   return nullptr;
 }
 
 HeapWord* ShenandoahFreeSet::try_allocate_in(ShenandoahHeapRegion* r, ShenandoahAllocRequest& req, bool& in_new_region) {
-  assert (!has_no_alloc_capacity(r), "Performance: should avoid full regions on this path: " SIZE_FORMAT, r->index());
-
-  if (_heap->is_concurrent_weak_root_in_progress() &&
-      r->is_trash()) {
+  assert (has_alloc_capacity(r), "Performance: should avoid full regions on this path: " SIZE_FORMAT, r->index());
+  if (_heap->is_concurrent_weak_root_in_progress() && r->is_trash()) {
     return nullptr;
   }
 
+  HeapWord* result = nullptr;
   try_recycle_trashed(r);
-
   in_new_region = r->is_empty();
 
-  HeapWord* result = nullptr;
-  size_t size = req.size();
+  if (in_new_region) {
+    log_debug(gc)("Using new region (" SIZE_FORMAT ") for %s (" PTR_FORMAT ").",
+                       r->index(), ShenandoahAllocRequest::alloc_type_to_string(req.type()), p2i(&req));
+  }
 
+  // req.size() is in words, r->free() is in bytes.
   if (req.is_lab_alloc()) {
+    // This is a GCLAB or a TLAB allocation
+    size_t adjusted_size = req.size();
     size_t free = align_down(r->free() >> LogHeapWordSize, MinObjAlignment);
-    if (size > free) {
-      size = free;
+    if (adjusted_size > free) {
+      adjusted_size = free;
     }
-    if (size >= req.min_size()) {
-      result = r->allocate(size, req.type());
-      assert (result != nullptr, "Allocation must succeed: free " SIZE_FORMAT ", actual " SIZE_FORMAT, free, size);
+    if (adjusted_size >= req.min_size()) {
+      result = r->allocate(adjusted_size, req.type());
+      log_debug(gc)("Allocated " SIZE_FORMAT " words (adjusted from " SIZE_FORMAT ") for %s @" PTR_FORMAT
+                          " from %s region " SIZE_FORMAT ", free bytes remaining: " SIZE_FORMAT,
+                          adjusted_size, req.size(), ShenandoahAllocRequest::alloc_type_to_string(req.type()), p2i(result),
+                          _partitions.partition_membership_name(r->index()), r->index(), r->free());
+      assert (result != nullptr, "Allocation must succeed: free " SIZE_FORMAT ", actual " SIZE_FORMAT, free, adjusted_size);
+      req.set_actual_size(adjusted_size);
+    } else {
+      log_trace(gc, free)("Failed to shrink TLAB or GCLAB request (" SIZE_FORMAT ") in region " SIZE_FORMAT " to " SIZE_FORMAT
+                          " because min_size() is " SIZE_FORMAT, req.size(), r->index(), adjusted_size, req.min_size());
     }
   } else {
+    size_t size = req.size();
     result = r->allocate(size, req.type());
+    if (result != nullptr) {
+      // Record actual allocation size
+      log_debug(gc)("Allocated " SIZE_FORMAT " words for %s @" PTR_FORMAT
+                          " from %s region " SIZE_FORMAT ", free bytes remaining: " SIZE_FORMAT,
+                          size, ShenandoahAllocRequest::alloc_type_to_string(req.type()), p2i(result),
+                          _partitions.partition_membership_name(r->index()),  r->index(), r->free());
+      req.set_actual_size(size);
+    }
   }
 
   if (result != nullptr) {
     // Allocation successful, bump stats:
     if (req.is_mutator_alloc()) {
-      increase_used(size * HeapWordSize);
-    }
-
-    // Record actual allocation size
-    req.set_actual_size(size);
+      _partitions.increase_used(ShenandoahFreeSetPartitionId::Mutator, req.actual_size() * HeapWordSize);
+    } else {
+      assert(req.is_gc_alloc(), "Should be gc_alloc since req wasn't mutator alloc");
 
-    if (req.is_gc_alloc()) {
+      // For GC allocations, we advance update_watermark because the objects relocated into this memory during
+      // evacuation are not updated during evacuation.
       r->set_update_watermark(r->top());
     }
   }
 
-  if (result == nullptr || has_no_alloc_capacity(r)) {
-    // Region cannot afford this or future allocations. Retire it.
-    //
-    // While this seems a bit harsh, especially in the case when this large allocation does not
-    // fit, but the next small one would, we are risking to inflate scan times when lots of
-    // almost-full regions precede the fully-empty region where we want allocate the entire TLAB.
-    // TODO: Record first fully-empty region, and use that for large allocations
-
-    // Record the remainder as allocation waste
-    if (req.is_mutator_alloc()) {
-      size_t waste = r->free();
-      if (waste > 0) {
-        increase_used(waste);
-        _heap->notify_mutator_alloc_words(waste >> LogHeapWordSize, true);
-      }
-    }
-
-    size_t num = r->index();
-    _collector_free_bitmap.clear_bit(num);
-    _mutator_free_bitmap.clear_bit(num);
-    // Touched the bounds? Need to update:
-    if (touches_bounds(num)) {
-      adjust_bounds();
-    }
-    assert_bounds();
-  }
-  return result;
-}
-
-bool ShenandoahFreeSet::touches_bounds(size_t num) const {
-  return num == _collector_leftmost || num == _collector_rightmost || num == _mutator_leftmost || num == _mutator_rightmost;
-}
+  static const size_t min_capacity = (size_t) (ShenandoahHeapRegion::region_size_bytes() * (1.0 - 1.0 / ShenandoahEvacWaste));
+  size_t ac = alloc_capacity(r);
 
-void ShenandoahFreeSet::recompute_bounds() {
-  // Reset to the most pessimistic case:
-  _mutator_rightmost = _max - 1;
-  _mutator_leftmost = 0;
-  _collector_rightmost = _max - 1;
-  _collector_leftmost = 0;
+  if (((result == nullptr) && (ac < min_capacity)) || (alloc_capacity(r) < PLAB::min_size() * HeapWordSize)) {
+    // Regardless of whether this allocation succeeded, if the remaining memory is less than PLAB:min_size(), retire this region.
+    // Note that retire_from_partition() increases used to account for waste.
 
-  // ...and adjust from there
-  adjust_bounds();
-}
+    // Also, if this allocation request failed and the consumed within this region * ShenandoahEvacWaste > region size,
+    // then retire the region so that subsequent searches can find available memory more quickly.
 
-void ShenandoahFreeSet::adjust_bounds() {
-  // Rewind both mutator bounds until the next bit.
-  while (_mutator_leftmost < _max && !is_mutator_free(_mutator_leftmost)) {
-    _mutator_leftmost++;
-  }
-  while (_mutator_rightmost > 0 && !is_mutator_free(_mutator_rightmost)) {
-    _mutator_rightmost--;
-  }
-  // Rewind both collector bounds until the next bit.
-  while (_collector_leftmost < _max && !is_collector_free(_collector_leftmost)) {
-    _collector_leftmost++;
-  }
-  while (_collector_rightmost > 0 && !is_collector_free(_collector_rightmost)) {
-    _collector_rightmost--;
+    size_t idx = r->index();
+    _partitions.retire_from_partition(req.is_mutator_alloc()?
+                                      ShenandoahFreeSetPartitionId::Mutator: ShenandoahFreeSetPartitionId::Collector,
+                                      idx, r->used());
+    _partitions.assert_bounds();
   }
+  return result;
 }
 
 HeapWord* ShenandoahFreeSet::allocate_contiguous(ShenandoahAllocRequest& req) {
+  assert(req.is_mutator_alloc(), "All humongous allocations are performed by mutator");
   shenandoah_assert_heaplocked();
 
   size_t words_size = req.size();
-  size_t num = ShenandoahHeapRegion::required_regions(words_size * HeapWordSize);
+  idx_t num = ShenandoahHeapRegion::required_regions(words_size * HeapWordSize);
 
-  // No regions left to satisfy allocation, bye.
-  if (num > mutator_count()) {
+  // Check if there are enough regions left to satisfy allocation.
+  if (num > (idx_t) _partitions.count(ShenandoahFreeSetPartitionId::Mutator)) {
     return nullptr;
   }
 
+  idx_t start_range = _partitions.leftmost_empty(ShenandoahFreeSetPartitionId::Mutator);
+  idx_t end_range = _partitions.rightmost_empty(ShenandoahFreeSetPartitionId::Mutator) + 1;
+  idx_t last_possible_start = end_range - num;
+
   // Find the continuous interval of $num regions, starting from $beg and ending in $end,
   // inclusive. Contiguous allocations are biased to the beginning.
-
-  size_t beg = _mutator_leftmost;
-  size_t end = beg;
+  idx_t beg = _partitions.find_index_of_next_available_cluster_of_regions(ShenandoahFreeSetPartitionId::Mutator,
+                                                                            start_range, num);
+  if (beg > last_possible_start) {
+    // Hit the end, goodbye
+    return nullptr;
+  }
+  idx_t end = beg;
 
   while (true) {
-    if (end >= _max) {
-      // Hit the end, goodbye
-      return nullptr;
-    }
-
-    // If regions are not adjacent, then current [beg; end] is useless, and we may fast-forward.
-    // If region is not completely free, the current [beg; end] is useless, and we may fast-forward.
-    if (!is_mutator_free(end) || !can_allocate_from(_heap->get_region(end))) {
-      end++;
-      beg = end;
-      continue;
+    // We've confirmed num contiguous regions belonging to Mutator partition, so no need to confirm membership.
+    // If region is not completely free, the current [beg; end] is useless, and we may fast-forward.  If we can extend
+    // the existing range, we can exploit that certain regions are already known to be in the Mutator free set.
+    while (!can_allocate_from(_heap->get_region(end))) {
+      // region[end] is not empty, so we restart our search after region[end]
+      idx_t slide_delta = end + 1 - beg;
+      if (beg + slide_delta > last_possible_start) {
+        // no room to slide
+        return nullptr;
+      }
+      for (idx_t span_end = beg + num; slide_delta > 0; slide_delta--) {
+        if (!_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, span_end)) {
+          beg = _partitions.find_index_of_next_available_cluster_of_regions(ShenandoahFreeSetPartitionId::Mutator,
+                                                                            span_end + 1, num);
+          break;
+        } else {
+          beg++;
+          span_end++;
+        }
+      }
+      // Here, either beg identifies a range of num regions all of which are in the Mutator free set, or beg > last_possible_start
+      if (beg > last_possible_start) {
+        // Hit the end, goodbye
+        return nullptr;
+      }
+      end = beg;
     }
 
     if ((end - beg + 1) == num) {
@@ -282,9 +859,8 @@ HeapWord* ShenandoahFreeSet::allocate_contiguous(ShenandoahAllocRequest& req) {
   }
 
   size_t remainder = words_size & ShenandoahHeapRegion::region_size_words_mask();
-
   // Initialize regions:
-  for (size_t i = beg; i <= end; i++) {
+  for (idx_t i = beg; i <= end; i++) {
     ShenandoahHeapRegion* r = _heap->get_region(i);
     try_recycle_trashed(r);
 
@@ -306,46 +882,23 @@ HeapWord* ShenandoahFreeSet::allocate_contiguous(ShenandoahAllocRequest& req) {
     }
 
     r->set_top(r->bottom() + used_words);
-
-    _mutator_free_bitmap.clear_bit(r->index());
   }
 
-  // While individual regions report their true use, all humongous regions are
-  // marked used in the free set.
-  increase_used(ShenandoahHeapRegion::region_size_bytes() * num);
-
   if (remainder != 0) {
     // Record this remainder as allocation waste
     _heap->notify_mutator_alloc_words(ShenandoahHeapRegion::region_size_words() - remainder, true);
   }
 
-  // Allocated at left/rightmost? Move the bounds appropriately.
-  if (beg == _mutator_leftmost || end == _mutator_rightmost) {
-    adjust_bounds();
-  }
-  assert_bounds();
+  // retire_range_from_partition() will adjust bounds on Mutator free set if appropriate
+  _partitions.retire_range_from_partition(ShenandoahFreeSetPartitionId::Mutator, beg, end);
 
+  size_t total_humongous_size = ShenandoahHeapRegion::region_size_bytes() * num;
+  _partitions.increase_used(ShenandoahFreeSetPartitionId::Mutator, total_humongous_size);
+  _partitions.assert_bounds();
   req.set_actual_size(words_size);
   return _heap->get_region(beg)->bottom();
 }
 
-bool ShenandoahFreeSet::can_allocate_from(ShenandoahHeapRegion *r) {
-  return r->is_empty() || (r->is_trash() && !_heap->is_concurrent_weak_root_in_progress());
-}
-
-size_t ShenandoahFreeSet::alloc_capacity(ShenandoahHeapRegion *r) {
-  if (r->is_trash()) {
-    // This would be recycled on allocation path
-    return ShenandoahHeapRegion::region_size_bytes();
-  } else {
-    return r->free();
-  }
-}
-
-bool ShenandoahFreeSet::has_no_alloc_capacity(ShenandoahHeapRegion *r) {
-  return alloc_capacity(r) == 0;
-}
-
 void ShenandoahFreeSet::try_recycle_trashed(ShenandoahHeapRegion *r) {
   if (r->is_trash()) {
     _heap->decrease_used(r->used());
@@ -370,20 +923,16 @@ void ShenandoahFreeSet::recycle_trash() {
 void ShenandoahFreeSet::flip_to_gc(ShenandoahHeapRegion* r) {
   size_t idx = r->index();
 
-  assert(_mutator_free_bitmap.at(idx), "Should be in mutator view");
+  assert(_partitions.partition_id_matches(idx, ShenandoahFreeSetPartitionId::Mutator), "Should be in mutator view");
   assert(can_allocate_from(r), "Should not be allocated");
 
-  _mutator_free_bitmap.clear_bit(idx);
-  _collector_free_bitmap.set_bit(idx);
-  _collector_leftmost = MIN2(idx, _collector_leftmost);
-  _collector_rightmost = MAX2(idx, _collector_rightmost);
-
-  _capacity -= alloc_capacity(r);
+  size_t ac = alloc_capacity(r);
+  _partitions.move_from_partition_to_partition(idx, ShenandoahFreeSetPartitionId::Mutator,
+                                               ShenandoahFreeSetPartitionId::Collector, ac);
+  _partitions.assert_bounds();
 
-  if (touches_bounds(idx)) {
-    adjust_bounds();
-  }
-  assert_bounds();
+  // We do not ensure that the region is no longer trash, relying on try_allocate_in(), which always comes next,
+  // to recycle trash before attempting to allocate anything in the region.
 }
 
 void ShenandoahFreeSet::clear() {
@@ -392,67 +941,259 @@ void ShenandoahFreeSet::clear() {
 }
 
 void ShenandoahFreeSet::clear_internal() {
-  _mutator_free_bitmap.clear();
-  _collector_free_bitmap.clear();
-  _mutator_leftmost = _max;
-  _mutator_rightmost = 0;
-  _collector_leftmost = _max;
-  _collector_rightmost = 0;
-  _capacity = 0;
-  _used = 0;
+  _partitions.make_all_regions_unavailable();
 }
 
-void ShenandoahFreeSet::rebuild() {
-  shenandoah_assert_heaplocked();
-  clear();
+void ShenandoahFreeSet::find_regions_with_alloc_capacity(size_t &cset_regions) {
+
+  cset_regions = 0;
+  clear_internal();
+  size_t region_size_bytes = _partitions.region_size_bytes();
+  size_t max_regions = _partitions.max_regions();
+
+  size_t mutator_leftmost = max_regions;
+  size_t mutator_rightmost = 0;
+  size_t mutator_leftmost_empty = max_regions;
+  size_t mutator_rightmost_empty = 0;
+
+  size_t mutator_regions = 0;
+  size_t mutator_used = 0;
 
   for (size_t idx = 0; idx < _heap->num_regions(); idx++) {
     ShenandoahHeapRegion* region = _heap->get_region(idx);
+    if (region->is_trash()) {
+      // Trashed regions represent regions that had been in the collection partition but have not yet been "cleaned up".
+      // The cset regions are not "trashed" until we have finished update refs.
+      cset_regions++;
+    }
     if (region->is_alloc_allowed() || region->is_trash()) {
-      assert(!region->is_cset(), "Shouldn't be adding those to the free set");
 
-      // Do not add regions that would surely fail allocation
-      if (has_no_alloc_capacity(region)) continue;
+      // Do not add regions that would almost surely fail allocation
+      size_t ac = alloc_capacity(region);
+      if (ac > PLAB::min_size() * HeapWordSize) {
+        _partitions.raw_assign_membership(idx, ShenandoahFreeSetPartitionId::Mutator);
 
-      _capacity += alloc_capacity(region);
-      assert(_used <= _capacity, "must not use more than we have");
+        if (idx < mutator_leftmost) {
+          mutator_leftmost = idx;
+        }
+        if (idx > mutator_rightmost) {
+          mutator_rightmost = idx;
+        }
+        if (ac == region_size_bytes) {
+          if (idx < mutator_leftmost_empty) {
+            mutator_leftmost_empty = idx;
+          }
+          if (idx > mutator_rightmost_empty) {
+            mutator_rightmost_empty = idx;
+          }
+        }
+        mutator_regions++;
+        mutator_used += (region_size_bytes - ac);
 
-      assert(!is_mutator_free(idx), "We are about to add it, it shouldn't be there already");
-      _mutator_free_bitmap.set_bit(idx);
+        log_debug(gc)(
+          "  Adding Region " SIZE_FORMAT " (Free: " SIZE_FORMAT "%s, Used: " SIZE_FORMAT "%s) to mutator partition",
+          idx, byte_size_in_proper_unit(region->free()), proper_unit_for_byte_size(region->free()),
+          byte_size_in_proper_unit(region->used()), proper_unit_for_byte_size(region->used()));
+      }
     }
   }
+  _partitions.establish_mutator_intervals(mutator_leftmost, mutator_rightmost, mutator_leftmost_empty, mutator_rightmost_empty,
+                                          mutator_regions, mutator_used);
+}
 
-  // Evac reserve: reserve trailing space for evacuations
-  size_t to_reserve = _heap->max_capacity() / 100 * ShenandoahEvacReserve;
-  size_t reserved = 0;
+void ShenandoahFreeSet::move_regions_from_collector_to_mutator(size_t max_xfer_regions) {
+  size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
+  size_t collector_empty_xfer = 0;
+  size_t collector_not_empty_xfer = 0;
+
+  // Process empty regions within the Collector free partition
+  if ((max_xfer_regions > 0) &&
+      (_partitions.leftmost_empty(ShenandoahFreeSetPartitionId::Collector)
+       <= _partitions.rightmost_empty(ShenandoahFreeSetPartitionId::Collector))) {
+    ShenandoahHeapLocker locker(_heap->lock());
+    idx_t rightmost = _partitions.rightmost_empty(ShenandoahFreeSetPartitionId::Collector);
+    for (idx_t idx = _partitions.leftmost_empty(ShenandoahFreeSetPartitionId::Collector);
+         (max_xfer_regions > 0) && (idx <= rightmost); ) {
+      assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Collector, idx),
+             "Boundaries or find_first_set_bit failed: " SSIZE_FORMAT, idx);
+      // Note: can_allocate_from() denotes that region is entirely empty
+      if (can_allocate_from(idx)) {
+        _partitions.move_from_partition_to_partition(idx, ShenandoahFreeSetPartitionId::Collector,
+                                                     ShenandoahFreeSetPartitionId::Mutator, region_size_bytes);
+        max_xfer_regions--;
+        collector_empty_xfer += region_size_bytes;
+      }
+      idx = _partitions.find_index_of_next_available_region(ShenandoahFreeSetPartitionId::Collector, idx + 1);
+    }
+  }
 
-  for (size_t idx = _heap->num_regions() - 1; idx > 0; idx--) {
-    if (reserved >= to_reserve) break;
+  // If there are any non-empty regions within Collector partition, we can also move them to the Mutator free partition
+  if ((max_xfer_regions > 0) && (_partitions.leftmost(ShenandoahFreeSetPartitionId::Collector)
+                                 <= _partitions.rightmost(ShenandoahFreeSetPartitionId::Collector))) {
+    ShenandoahHeapLocker locker(_heap->lock());
+    idx_t rightmost = _partitions.rightmost(ShenandoahFreeSetPartitionId::Collector);
+    for (idx_t idx = _partitions.leftmost(ShenandoahFreeSetPartitionId::Collector);
+         (max_xfer_regions > 0) && (idx <= rightmost); ) {
+      assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Collector, idx),
+             "Boundaries or find_first_set_bit failed: " SSIZE_FORMAT, idx);
+      size_t ac = alloc_capacity(idx);
+      if (ac > 0) {
+        _partitions.move_from_partition_to_partition(idx, ShenandoahFreeSetPartitionId::Collector,
+                                                     ShenandoahFreeSetPartitionId::Mutator, ac);
+        max_xfer_regions--;
+        collector_not_empty_xfer += ac;
+      }
+      idx = _partitions.find_index_of_next_available_region(ShenandoahFreeSetPartitionId::Collector, idx + 1);
+    }
+  }
 
-    ShenandoahHeapRegion* region = _heap->get_region(idx);
-    if (_mutator_free_bitmap.at(idx) && can_allocate_from(region)) {
-      _mutator_free_bitmap.clear_bit(idx);
-      _collector_free_bitmap.set_bit(idx);
-      size_t ac = alloc_capacity(region);
-      _capacity -= ac;
-      reserved += ac;
+  size_t collector_xfer = collector_empty_xfer + collector_not_empty_xfer;
+  log_info(gc)("At start of update refs, moving " SIZE_FORMAT "%s to Mutator free partition from Collector Reserve",
+               byte_size_in_proper_unit(collector_xfer), proper_unit_for_byte_size(collector_xfer));
+}
+
+void ShenandoahFreeSet::prepare_to_rebuild(size_t &cset_regions) {
+  shenandoah_assert_heaplocked();
+
+  log_debug(gc)("Rebuilding FreeSet");
+
+  // This places regions that have alloc_capacity into the mutator partition.
+  find_regions_with_alloc_capacity(cset_regions);
+}
+
+void ShenandoahFreeSet::finish_rebuild(size_t cset_regions) {
+  shenandoah_assert_heaplocked();
+
+  // Our desire is to reserve this much memory for future evacuation.  We may end up reserving less, if
+  // memory is in short supply.
+
+  size_t reserve = _heap->max_capacity() * ShenandoahEvacReserve / 100;
+  size_t available_in_collector_partition = (_partitions.capacity_of(ShenandoahFreeSetPartitionId::Collector)
+                                             - _partitions.used_by(ShenandoahFreeSetPartitionId::Collector));
+  size_t additional_reserve;
+  if (available_in_collector_partition < reserve) {
+    additional_reserve = reserve - available_in_collector_partition;
+  } else {
+    additional_reserve = 0;
+  }
+
+  reserve_regions(reserve);
+  _partitions.assert_bounds();
+  log_status();
+}
+
+void ShenandoahFreeSet::rebuild() {
+  size_t cset_regions;
+  prepare_to_rebuild(cset_regions);
+  finish_rebuild(cset_regions);
+}
+
+void ShenandoahFreeSet::reserve_regions(size_t to_reserve) {
+  for (size_t i = _heap->num_regions(); i > 0; i--) {
+    size_t idx = i - 1;
+    ShenandoahHeapRegion* r = _heap->get_region(idx);
+
+    if (!_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, idx)) {
+      continue;
+    }
+
+    size_t ac = alloc_capacity(r);
+    assert (ac > 0, "Membership in free partition implies has capacity");
+
+    bool move_to_collector = _partitions.available_in(ShenandoahFreeSetPartitionId::Collector) < to_reserve;
+    if (!move_to_collector) {
+      // We've satisfied to_reserve
+      break;
+    }
+
+    if (move_to_collector) {
+      // Note: In a previous implementation, regions were only placed into the survivor space (collector_is_free) if
+      // they were entirely empty.  This has the effect of causing new Mutator allocation to reside next to objects
+      // that have already survived at least one GC, mixing ephemeral with longer-lived objects in the same region.
+      // Any objects that have survived a GC are less likely to immediately become garbage, so a region that contains
+      // survivor objects is less likely to be selected for the collection set.  This alternative implementation allows
+      // survivor regions to continue accumulating other survivor objects, and makes it more likely that ephemeral objects
+      // occupy regions comprised entirely of ephemeral objects.  These regions are highly likely to be included in the next
+      // collection set, and they are easily evacuated because they have low density of live objects.
+      _partitions.move_from_partition_to_partition(idx, ShenandoahFreeSetPartitionId::Mutator,
+                                                   ShenandoahFreeSetPartitionId::Collector, ac);
+      log_debug(gc)("  Shifting region " SIZE_FORMAT " from mutator_free to collector_free", idx);
     }
   }
 
-  recompute_bounds();
-  assert_bounds();
+  if (LogTarget(Info, gc, free)::is_enabled()) {
+    size_t reserve = _partitions.capacity_of(ShenandoahFreeSetPartitionId::Collector);
+    if (reserve < to_reserve) {
+      log_debug(gc)("Wanted " PROPERFMT " for young reserve, but only reserved: " PROPERFMT,
+                    PROPERFMTARGS(to_reserve), PROPERFMTARGS(reserve));
+    }
+  }
 }
 
 void ShenandoahFreeSet::log_status() {
   shenandoah_assert_heaplocked();
 
-  LogTarget(Info, gc, ergo) lt;
+#ifdef ASSERT
+  // Dump of the FreeSet details is only enabled if assertions are enabled
+  if (LogTarget(Debug, gc, free)::is_enabled()) {
+#define BUFFER_SIZE 80
+    size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
+    size_t consumed_collector = 0;
+    size_t available_collector = 0;
+    size_t consumed_mutator = 0;
+    size_t available_mutator = 0;
+
+    char buffer[BUFFER_SIZE];
+    for (uint i = 0; i < BUFFER_SIZE; i++) {
+      buffer[i] = '\0';
+    }
+    log_debug(gc)("FreeSet map legend: M:mutator_free C:collector_free H:humongous _:retired");
+    log_debug(gc)(" mutator free range [" SIZE_FORMAT ".." SIZE_FORMAT "],"
+                  " collector free range [" SIZE_FORMAT ".." SIZE_FORMAT "]",
+                  _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator),
+                  _partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator),
+                  _partitions.leftmost(ShenandoahFreeSetPartitionId::Collector),
+                  _partitions.rightmost(ShenandoahFreeSetPartitionId::Collector));
+
+    for (uint i = 0; i < _heap->num_regions(); i++) {
+      ShenandoahHeapRegion *r = _heap->get_region(i);
+      uint idx = i % 64;
+      if ((i != 0) && (idx == 0)) {
+        log_debug(gc)(" %6u: %s", i-64, buffer);
+      }
+      if (_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, i)) {
+        size_t capacity = alloc_capacity(r);
+        available_mutator += capacity;
+        consumed_mutator += region_size_bytes - capacity;
+        buffer[idx] = (capacity == region_size_bytes)? 'M': 'm';
+      } else if (_partitions.in_free_set(ShenandoahFreeSetPartitionId::Collector, i)) {
+        size_t capacity = alloc_capacity(r);
+        available_collector += capacity;
+        consumed_collector += region_size_bytes - capacity;
+        buffer[idx] = (capacity == region_size_bytes)? 'C': 'c';
+      } else if (r->is_humongous()) {
+        buffer[idx] = 'h';
+      } else {
+        buffer[idx] = '_';
+      }
+    }
+    uint remnant = _heap->num_regions() % 64;
+    if (remnant > 0) {
+      buffer[remnant] = '\0';
+    } else {
+      remnant = 64;
+    }
+    log_debug(gc)(" %6u: %s", (uint) (_heap->num_regions() - remnant), buffer);
+  }
+#endif
+
+  LogTarget(Info, gc, free) lt;
   if (lt.is_enabled()) {
     ResourceMark rm;
     LogStream ls(lt);
 
     {
-      size_t last_idx = 0;
+      idx_t last_idx = 0;
       size_t max = 0;
       size_t max_contig = 0;
       size_t empty_contig = 0;
@@ -461,13 +1202,12 @@ void ShenandoahFreeSet::log_status() {
       size_t total_free = 0;
       size_t total_free_ext = 0;
 
-      for (size_t idx = _mutator_leftmost; idx <= _mutator_rightmost; idx++) {
-        if (is_mutator_free(idx)) {
+      for (idx_t idx = _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator);
+           idx <= _partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator); idx++) {
+        if (_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, idx)) {
           ShenandoahHeapRegion *r = _heap->get_region(idx);
           size_t free = alloc_capacity(r);
-
           max = MAX2(max, free);
-
           if (r->is_empty()) {
             total_free_ext += free;
             if (last_idx + 1 == idx) {
@@ -478,10 +1218,8 @@ void ShenandoahFreeSet::log_status() {
           } else {
             empty_contig = 0;
           }
-
           total_used += r->used();
           total_free += free;
-
           max_contig = MAX2(max_contig, empty_contig);
           last_idx = idx;
         }
@@ -490,8 +1228,13 @@ void ShenandoahFreeSet::log_status() {
       size_t max_humongous = max_contig * ShenandoahHeapRegion::region_size_bytes();
       size_t free = capacity() - used();
 
+      // Since certain regions that belonged to the Mutator free partition at the time of most recent rebuild may have been
+      // retired, the sum of used and capacities within regions that are still in the Mutator free partition may not match
+      // my internally tracked values of used() and free().
+      assert(free == total_free, "Free memory should match");
+
       ls.print("Free: " SIZE_FORMAT "%s, Max: " SIZE_FORMAT "%s regular, " SIZE_FORMAT "%s humongous, ",
-               byte_size_in_proper_unit(total_free),    proper_unit_for_byte_size(total_free),
+               byte_size_in_proper_unit(free),          proper_unit_for_byte_size(free),
                byte_size_in_proper_unit(max),           proper_unit_for_byte_size(max),
                byte_size_in_proper_unit(max_humongous), proper_unit_for_byte_size(max_humongous)
       );
@@ -506,38 +1249,43 @@ void ShenandoahFreeSet::log_status() {
       ls.print(SIZE_FORMAT "%% external, ", frag_ext);
 
       size_t frag_int;
-      if (mutator_count() > 0) {
-        frag_int = (100 * (total_used / mutator_count()) / ShenandoahHeapRegion::region_size_bytes());
+      if (_partitions.count(ShenandoahFreeSetPartitionId::Mutator) > 0) {
+        frag_int = (100 * (total_used / _partitions.count(ShenandoahFreeSetPartitionId::Mutator))
+                    / ShenandoahHeapRegion::region_size_bytes());
       } else {
         frag_int = 0;
       }
       ls.print(SIZE_FORMAT "%% internal; ", frag_int);
+      ls.print("Used: " SIZE_FORMAT "%s, Mutator Free: " SIZE_FORMAT,
+               byte_size_in_proper_unit(total_used), proper_unit_for_byte_size(total_used),
+               _partitions.count(ShenandoahFreeSetPartitionId::Mutator));
     }
 
     {
       size_t max = 0;
       size_t total_free = 0;
+      size_t total_used = 0;
 
-      for (size_t idx = _collector_leftmost; idx <= _collector_rightmost; idx++) {
-        if (is_collector_free(idx)) {
+      for (idx_t idx = _partitions.leftmost(ShenandoahFreeSetPartitionId::Collector);
+           idx <= _partitions.rightmost(ShenandoahFreeSetPartitionId::Collector); idx++) {
+        if (_partitions.in_free_set(ShenandoahFreeSetPartitionId::Collector, idx)) {
           ShenandoahHeapRegion *r = _heap->get_region(idx);
           size_t free = alloc_capacity(r);
           max = MAX2(max, free);
           total_free += free;
+          total_used += r->used();
         }
       }
-
-      ls.print_cr("Reserve: " SIZE_FORMAT "%s, Max: " SIZE_FORMAT "%s",
-                  byte_size_in_proper_unit(total_free), proper_unit_for_byte_size(total_free),
-                  byte_size_in_proper_unit(max),        proper_unit_for_byte_size(max));
+      ls.print(" Collector Reserve: " SIZE_FORMAT "%s, Max: " SIZE_FORMAT "%s; Used: " SIZE_FORMAT "%s",
+               byte_size_in_proper_unit(total_free), proper_unit_for_byte_size(total_free),
+               byte_size_in_proper_unit(max),        proper_unit_for_byte_size(max),
+               byte_size_in_proper_unit(total_used), proper_unit_for_byte_size(total_used));
     }
   }
 }
 
 HeapWord* ShenandoahFreeSet::allocate(ShenandoahAllocRequest& req, bool& in_new_region) {
   shenandoah_assert_heaplocked();
-  assert_bounds();
-
   if (req.size() > ShenandoahHeapRegion::humongous_threshold_words()) {
     switch (req.type()) {
       case ShenandoahAllocRequest::_alloc_shared:
@@ -559,71 +1307,40 @@ HeapWord* ShenandoahFreeSet::allocate(ShenandoahAllocRequest& req, bool& in_new_
   }
 }
 
-size_t ShenandoahFreeSet::unsafe_peek_free() const {
-  // Deliberately not locked, this method is unsafe when free set is modified.
-
-  for (size_t index = _mutator_leftmost; index <= _mutator_rightmost; index++) {
-    if (index < _max && is_mutator_free(index)) {
-      ShenandoahHeapRegion* r = _heap->get_region(index);
-      if (r->free() >= MinTLABSize) {
-        return r->free();
-      }
-    }
-  }
-
-  // It appears that no regions left
-  return 0;
-}
-
 void ShenandoahFreeSet::print_on(outputStream* out) const {
-  out->print_cr("Mutator Free Set: " SIZE_FORMAT "", mutator_count());
-  for (size_t index = _mutator_leftmost; index <= _mutator_rightmost; index++) {
-    if (is_mutator_free(index)) {
-      _heap->get_region(index)->print_on(out);
-    }
+  out->print_cr("Mutator Free Set: " SIZE_FORMAT "", _partitions.count(ShenandoahFreeSetPartitionId::Mutator));
+  idx_t rightmost = _partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator);
+  for (idx_t index = _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator); index <= rightmost; ) {
+    assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, index),
+           "Boundaries or find_first_set_bit failed: " SSIZE_FORMAT, index);
+    _heap->get_region(index)->print_on(out);
+    index = _partitions.find_index_of_next_available_region(ShenandoahFreeSetPartitionId::Mutator, index + 1);
   }
-  out->print_cr("Collector Free Set: " SIZE_FORMAT "", collector_count());
-  for (size_t index = _collector_leftmost; index <= _collector_rightmost; index++) {
-    if (is_collector_free(index)) {
-      _heap->get_region(index)->print_on(out);
-    }
+  out->print_cr("Collector Free Set: " SIZE_FORMAT "", _partitions.count(ShenandoahFreeSetPartitionId::Collector));
+  rightmost = _partitions.rightmost(ShenandoahFreeSetPartitionId::Collector);
+  for (idx_t index = _partitions.leftmost(ShenandoahFreeSetPartitionId::Collector); index <= rightmost; ) {
+    assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Collector, index),
+           "Boundaries or find_first_set_bit failed: " SSIZE_FORMAT, index);
+    _heap->get_region(index)->print_on(out);
+    index = _partitions.find_index_of_next_available_region(ShenandoahFreeSetPartitionId::Collector, index + 1);
   }
 }
 
-/*
- * Internal fragmentation metric: describes how fragmented the heap regions are.
- *
- * It is derived as:
- *
- *               sum(used[i]^2, i=0..k)
- *   IF = 1 - ------------------------------
- *              C * sum(used[i], i=0..k)
- *
- * ...where k is the number of regions in computation, C is the region capacity, and
- * used[i] is the used space in the region.
- *
- * The non-linearity causes IF to be lower for the cases where the same total heap
- * used is densely packed. For example:
- *   a) Heap is completely full  => IF = 0
- *   b) Heap is half full, first 50% regions are completely full => IF = 0
- *   c) Heap is half full, each region is 50% full => IF = 1/2
- *   d) Heap is quarter full, first 50% regions are completely full => IF = 0
- *   e) Heap is quarter full, each region is 25% full => IF = 3/4
- *   f) Heap has one small object per each region => IF =~ 1
- */
 double ShenandoahFreeSet::internal_fragmentation() {
   double squared = 0;
   double linear = 0;
   int count = 0;
 
-  for (size_t index = _mutator_leftmost; index <= _mutator_rightmost; index++) {
-    if (is_mutator_free(index)) {
-      ShenandoahHeapRegion* r = _heap->get_region(index);
-      size_t used = r->used();
-      squared += used * used;
-      linear += used;
-      count++;
-    }
+  idx_t rightmost = _partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator);
+  for (idx_t index = _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator); index <= rightmost; ) {
+    assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, index),
+           "Boundaries or find_first_set_bit failed: " SSIZE_FORMAT, index);
+    ShenandoahHeapRegion* r = _heap->get_region(index);
+    size_t used = r->used();
+    squared += used * used;
+    linear += used;
+    count++;
+    index = _partitions.find_index_of_next_available_region(ShenandoahFreeSetPartitionId::Mutator, index + 1);
   }
 
   if (count > 0) {
@@ -634,43 +1351,31 @@ double ShenandoahFreeSet::internal_fragmentation() {
   }
 }
 
-/*
- * External fragmentation metric: describes how fragmented the heap is.
- *
- * It is derived as:
- *
- *   EF = 1 - largest_contiguous_free / total_free
- *
- * For example:
- *   a) Heap is completely empty => EF = 0
- *   b) Heap is completely full => EF = 0
- *   c) Heap is first-half full => EF = 1/2
- *   d) Heap is half full, full and empty regions interleave => EF =~ 1
- */
 double ShenandoahFreeSet::external_fragmentation() {
-  size_t last_idx = 0;
+  idx_t last_idx = 0;
   size_t max_contig = 0;
   size_t empty_contig = 0;
 
   size_t free = 0;
 
-  for (size_t index = _mutator_leftmost; index <= _mutator_rightmost; index++) {
-    if (is_mutator_free(index)) {
-      ShenandoahHeapRegion* r = _heap->get_region(index);
-      if (r->is_empty()) {
-        free += ShenandoahHeapRegion::region_size_bytes();
-        if (last_idx + 1 == index) {
-          empty_contig++;
-        } else {
-          empty_contig = 1;
-        }
+  idx_t rightmost = _partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator);
+  for (idx_t index = _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator); index <= rightmost; ) {
+    assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, index),
+           "Boundaries or find_first_set_bit failed: " SSIZE_FORMAT, index);
+    ShenandoahHeapRegion* r = _heap->get_region(index);
+    if (r->is_empty()) {
+      free += ShenandoahHeapRegion::region_size_bytes();
+      if (last_idx + 1 == index) {
+        empty_contig++;
       } else {
-        empty_contig = 0;
+        empty_contig = 1;
       }
-
-      max_contig = MAX2(max_contig, empty_contig);
-      last_idx = index;
+    } else {
+      empty_contig = 0;
     }
+    max_contig = MAX2(max_contig, empty_contig);
+    last_idx = index;
+    index = _partitions.find_index_of_next_available_region(ShenandoahFreeSetPartitionId::Mutator, index + 1);
   }
 
   if (free > 0) {
@@ -680,30 +1385,3 @@ double ShenandoahFreeSet::external_fragmentation() {
   }
 }
 
-#ifdef ASSERT
-void ShenandoahFreeSet::assert_bounds() const {
-  // Performance invariants. Failing these would not break the free set, but performance
-  // would suffer.
-  assert (_mutator_leftmost <= _max, "leftmost in bounds: "  SIZE_FORMAT " < " SIZE_FORMAT, _mutator_leftmost,  _max);
-  assert (_mutator_rightmost < _max, "rightmost in bounds: " SIZE_FORMAT " < " SIZE_FORMAT, _mutator_rightmost, _max);
-
-  assert (_mutator_leftmost == _max || is_mutator_free(_mutator_leftmost),  "leftmost region should be free: " SIZE_FORMAT,  _mutator_leftmost);
-  assert (_mutator_rightmost == 0   || is_mutator_free(_mutator_rightmost), "rightmost region should be free: " SIZE_FORMAT, _mutator_rightmost);
-
-  size_t beg_off = _mutator_free_bitmap.find_first_set_bit(0);
-  size_t end_off = _mutator_free_bitmap.find_first_set_bit(_mutator_rightmost + 1);
-  assert (beg_off >= _mutator_leftmost, "free regions before the leftmost: " SIZE_FORMAT ", bound " SIZE_FORMAT, beg_off, _mutator_leftmost);
-  assert (end_off == _max,      "free regions past the rightmost: " SIZE_FORMAT ", bound " SIZE_FORMAT,  end_off, _mutator_rightmost);
-
-  assert (_collector_leftmost <= _max, "leftmost in bounds: "  SIZE_FORMAT " < " SIZE_FORMAT, _collector_leftmost,  _max);
-  assert (_collector_rightmost < _max, "rightmost in bounds: " SIZE_FORMAT " < " SIZE_FORMAT, _collector_rightmost, _max);
-
-  assert (_collector_leftmost == _max || is_collector_free(_collector_leftmost),  "leftmost region should be free: " SIZE_FORMAT,  _collector_leftmost);
-  assert (_collector_rightmost == 0   || is_collector_free(_collector_rightmost), "rightmost region should be free: " SIZE_FORMAT, _collector_rightmost);
-
-  beg_off = _collector_free_bitmap.find_first_set_bit(0);
-  end_off = _collector_free_bitmap.find_first_set_bit(_collector_rightmost + 1);
-  assert (beg_off >= _collector_leftmost, "free regions before the leftmost: " SIZE_FORMAT ", bound " SIZE_FORMAT, beg_off, _collector_leftmost);
-  assert (end_off == _max,      "free regions past the rightmost: " SIZE_FORMAT ", bound " SIZE_FORMAT,  end_off, _collector_rightmost);
-}
-#endif
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
index 634adfb63e0..e2852e5548c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2016, 2019, Red Hat, Inc. All rights reserved.
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,70 +28,366 @@
 
 #include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
+#include "gc/shenandoah/shenandoahSimpleBitMap.hpp"
+
+// Each ShenandoahHeapRegion is associated with a ShenandoahFreeSetPartitionId.
+enum class ShenandoahFreeSetPartitionId : uint8_t {
+  Mutator,                      // Region is in the Mutator free set: available memory is available to mutators.
+  Collector,                    // Region is in the Collector free set: available memory is reserved for evacuations.
+  NotFree                       // Region is in no free set: it has no available memory
+};
+
+// We do not maintain counts, capacity, or used for regions that are not free.  Informally, if a region is NotFree, it is
+// in no partition.  NumPartitions represents the size of an array that may be indexed by Mutator or Collector.
+#define NumPartitions           (ShenandoahFreeSetPartitionId::NotFree)
+#define IntNumPartitions     int(ShenandoahFreeSetPartitionId::NotFree)
+#define UIntNumPartitions   uint(ShenandoahFreeSetPartitionId::NotFree)
+
+// ShenandoahRegionPartitions provides an abstraction to help organize the implementation of ShenandoahFreeSet.  This
+// class implements partitioning of regions into distinct sets.  Each ShenandoahHeapRegion is either in the Mutator free set,
+// the Collector free set, or in neither free set (NotFree).  When we speak of a "free partition", we mean partitions that
+// for which the ShenandoahFreeSetPartitionId is not equal to NotFree.
+class ShenandoahRegionPartitions {
+
+private:
+  const ssize_t _max;           // The maximum number of heap regions
+  const size_t _region_size_bytes;
+  const ShenandoahFreeSet* _free_set;
+  // For each partition, we maintain a bitmap of which regions are affiliated with his partition.
+  ShenandoahSimpleBitMap _membership[UIntNumPartitions];
+
+  // For each partition, we track an interval outside of which a region affiliated with that partition is guaranteed
+  // not to be found. This makes searches for free space more efficient.  For each partition p, _leftmosts[p]
+  // represents its least index, and its _rightmosts[p] its greatest index. Empty intervals are indicated by the
+  // canonical [_max, -1].
+  ssize_t _leftmosts[UIntNumPartitions];
+  ssize_t _rightmosts[UIntNumPartitions];
+
+  // Allocation for humongous objects needs to find regions that are entirely empty.  For each partion p, _leftmosts_empty[p]
+  // represents the first region belonging to this partition that is completely empty and _rightmosts_empty[p] represents the
+  // last region that is completely empty.  If there is no completely empty region in this partition, this is represented
+  // by the canonical [_max, -1].
+  ssize_t _leftmosts_empty[UIntNumPartitions];
+  ssize_t _rightmosts_empty[UIntNumPartitions];
+
+  // For each partition p, _capacity[p] represents the total amount of memory within the partition at the time
+  // of the most recent rebuild, _used[p] represents the total amount of memory that has been allocated within this
+  // partition (either already allocated as of the rebuild, or allocated since the rebuild).  _capacity[p] and _used[p]
+  // are denoted in bytes.  Note that some regions that had been assigned to a particular partition at rebuild time
+  // may have been retired following the rebuild.  The tallies for these regions are still reflected in _capacity[p]
+  // and _used[p], even though the region may have been removed from the free set.
+  size_t _capacity[UIntNumPartitions];
+  size_t _used[UIntNumPartitions];
+  size_t _region_counts[UIntNumPartitions];
+
+  // Shrink the intervals associated with partition when region idx is removed from this free set
+  inline void shrink_interval_if_boundary_modified(ShenandoahFreeSetPartitionId partition, ssize_t idx);
+
+  // Shrink the intervals associated with partition when regions low_idx through high_idx inclusive are removed from this free set
+  inline void shrink_interval_if_range_modifies_either_boundary(ShenandoahFreeSetPartitionId partition,
+                                                                ssize_t low_idx, ssize_t high_idx);
+  inline void expand_interval_if_boundary_modified(ShenandoahFreeSetPartitionId partition, ssize_t idx, size_t capacity);
+
+#ifndef PRODUCT
+  void dump_bitmap_row(ssize_t region_idx) const;
+  void dump_bitmap_range(ssize_t start_region_idx, ssize_t end_region_idx) const;
+  void dump_bitmap() const;
+#endif
+public:
+  ShenandoahRegionPartitions(size_t max_regions, ShenandoahFreeSet* free_set);
+  ~ShenandoahRegionPartitions() {}
+
+  // Remove all regions from all partitions and reset all bounds
+  void make_all_regions_unavailable();
+
+  // Set the partition id for a particular region without adjusting interval bounds or usage/capacity tallies
+  inline void raw_assign_membership(size_t idx, ShenandoahFreeSetPartitionId p) {
+    _membership[int(p)].set_bit(idx);
+  }
+
+  // Set the Mutator intervals, usage, and capacity according to arguments.  Reset the Collector intervals, used, capacity
+  // to represent empty Collector free set.  We use this at the end of rebuild_free_set() to avoid the overhead of making
+  // many redundant incremental adjustments to the mutator intervals as the free set is being rebuilt.
+  void establish_mutator_intervals(ssize_t mutator_leftmost, ssize_t mutator_rightmost,
+                                   ssize_t mutator_leftmost_empty, ssize_t mutator_rightmost_empty,
+                                   size_t mutator_region_count, size_t mutator_used);
+
+  // Retire region idx from within partition, , leaving its capacity and used as part of the original free partition's totals.
+  // Requires that region idx is in in the Mutator or Collector partitions.  Hereafter, identifies this region as NotFree.
+  // Any remnant of available memory at the time of retirement is added to the original partition's total of used bytes.
+  void retire_from_partition(ShenandoahFreeSetPartitionId p, ssize_t idx, size_t used_bytes);
+
+  // Retire all regions between low_idx and high_idx inclusive from within partition.  Requires that each region idx is
+  // in the same Mutator or Collector partition.  Hereafter, identifies each region as NotFree.   Assumes that each region
+  // is now considered fully used, since the region is presumably used to represent a humongous object.
+  void retire_range_from_partition(ShenandoahFreeSetPartitionId partition, ssize_t low_idx, ssize_t high_idx);
+
+  // Place region idx into free set which_partition.  Requires that idx is currently NotFree.
+  void make_free(ssize_t idx, ShenandoahFreeSetPartitionId which_partition, size_t region_capacity);
+
+  // Place region idx into free partition new_partition, adjusting used and capacity totals for the original and new partition
+  // given that available bytes can still be allocated within this region.  Requires that idx is currently not NotFree.
+  void move_from_partition_to_partition(ssize_t idx, ShenandoahFreeSetPartitionId orig_partition,
+                                        ShenandoahFreeSetPartitionId new_partition, size_t available);
+
+  const char* partition_membership_name(ssize_t idx) const;
+
+  // Return the index of the next available region >= start_index, or maximum_regions if not found.
+  inline ssize_t find_index_of_next_available_region(ShenandoahFreeSetPartitionId which_partition, ssize_t start_index) const;
+
+  // Return the index of the previous available region <= last_index, or -1 if not found.
+  inline ssize_t find_index_of_previous_available_region(ShenandoahFreeSetPartitionId which_partition, ssize_t last_index) const;
+
+  // Return the index of the next available cluster of cluster_size regions >= start_index, or maximum_regions if not found.
+  inline ssize_t find_index_of_next_available_cluster_of_regions(ShenandoahFreeSetPartitionId which_partition,
+                                                                 ssize_t start_index, size_t cluster_size) const;
+
+  // Return the index of the previous available cluster of cluster_size regions <= last_index, or -1 if not found.
+  inline ssize_t find_index_of_previous_available_cluster_of_regions(ShenandoahFreeSetPartitionId which_partition,
+                                                                     ssize_t last_index, size_t cluster_size) const;
+
+  inline bool in_free_set(ShenandoahFreeSetPartitionId which_partition, ssize_t idx) const {
+    return _membership[int(which_partition)].is_set(idx);
+  }
+
+  // Returns the ShenandoahFreeSetPartitionId affiliation of region idx, NotFree if this region is not currently in any partition.
+  // This does not enforce that free_set membership implies allocation capacity.
+  inline ShenandoahFreeSetPartitionId membership(ssize_t idx) const;
+
+#ifdef ASSERT
+  // Returns true iff region idx's membership is which_partition.  If which_partition represents a free set, asserts
+  // that the region has allocation capacity.
+  inline bool partition_id_matches(ssize_t idx, ShenandoahFreeSetPartitionId which_partition) const;
+#endif
+
+  inline size_t max_regions() const { return _max; }
+
+  inline size_t region_size_bytes() const { return _region_size_bytes; };
+
+  // The following four methods return the left-most and right-most bounds on ranges of regions representing
+  // the requested set.  The _empty variants represent bounds on the range that holds completely empty
+  // regions, which are required for humongous allocations and desired for "very large" allocations.
+  //   if the requested which_partition is empty:
+  //     leftmost() and leftmost_empty() return _max, rightmost() and rightmost_empty() return 0
+  //   otherwise, expect the following:
+  //     0 <= leftmost <= leftmost_empty <= rightmost_empty <= rightmost < _max
+  inline ssize_t leftmost(ShenandoahFreeSetPartitionId which_partition) const;
+  inline ssize_t rightmost(ShenandoahFreeSetPartitionId which_partition) const;
+  ssize_t leftmost_empty(ShenandoahFreeSetPartitionId which_partition);
+  ssize_t rightmost_empty(ShenandoahFreeSetPartitionId which_partition);
+
+  inline bool is_empty(ShenandoahFreeSetPartitionId which_partition) const;
+
+  inline void increase_used(ShenandoahFreeSetPartitionId which_partition, size_t bytes);
+
+  inline size_t capacity_of(ShenandoahFreeSetPartitionId which_partition) const {
+    assert (which_partition < NumPartitions, "selected free set must be valid");
+    return _capacity[int(which_partition)];
+  }
+
+  inline size_t used_by(ShenandoahFreeSetPartitionId which_partition) const {
+    assert (which_partition < NumPartitions, "selected free set must be valid");
+    return _used[int(which_partition)];
+  }
+
+  inline size_t available_in(ShenandoahFreeSetPartitionId which_partition) const {
+    assert (which_partition < NumPartitions, "selected free set must be valid");
+    return _capacity[int(which_partition)] - _used[int(which_partition)];
+  }
+
+  inline void set_capacity_of(ShenandoahFreeSetPartitionId which_partition, size_t value) {
+    assert (which_partition < NumPartitions, "selected free set must be valid");
+    _capacity[int(which_partition)] = value;
+  }
+
+  inline void set_used_by(ShenandoahFreeSetPartitionId which_partition, size_t value) {
+    assert (which_partition < NumPartitions, "selected free set must be valid");
+    _used[int(which_partition)] = value;
+  }
+
+  inline size_t count(ShenandoahFreeSetPartitionId which_partition) const { return _region_counts[int(which_partition)]; }
+
+  // Assure leftmost, rightmost, leftmost_empty, and rightmost_empty bounds are valid for all free sets.
+  // Valid bounds honor all of the following (where max is the number of heap regions):
+  //   if the set is empty, leftmost equals max and rightmost equals 0
+  //   Otherwise (the set is not empty):
+  //     0 <= leftmost < max and 0 <= rightmost < max
+  //     the region at leftmost is in the set
+  //     the region at rightmost is in the set
+  //     rightmost >= leftmost
+  //     for every idx that is in the set {
+  //       idx >= leftmost &&
+  //       idx <= rightmost
+  //     }
+  //   if the set has no empty regions, leftmost_empty equals max and rightmost_empty equals 0
+  //   Otherwise (the region has empty regions):
+  //     0 <= leftmost_empty < max and 0 <= rightmost_empty < max
+  //     rightmost_empty >= leftmost_empty
+  //     for every idx that is in the set and is empty {
+  //       idx >= leftmost &&
+  //       idx <= rightmost
+  //     }
+  void assert_bounds() NOT_DEBUG_RETURN;
+};
+
+// Publicly, ShenandoahFreeSet represents memory that is available to mutator threads.  The public capacity(), used(),
+// and available() methods represent this public notion of memory that is under control of the mutator.  Separately,
+// ShenandoahFreeSet also represents memory available to garbage collection activities for compaction purposes.
+//
+// The Shenandoah garbage collector evacuates live objects out of specific regions that are identified as members of the
+// collection set (cset).
+//
+// The ShenandoahFreeSet endeavors to congregrate survivor objects (objects that have been evacuated at least once) at the
+// high end of memory.  New mutator allocations are taken from the low end of memory.  Within the mutator's range of regions,
+// humongous allocations are taken from the lowest addresses, and LAB (local allocation buffers) and regular shared allocations
+// are taken from the higher address of the mutator's range of regions.  This approach allows longer lasting survivor regions
+// to congregate at the top of the heap and longer lasting humongous regions to congregate at the bottom of the heap, with
+// short-lived frequently evacuated regions occupying the middle of the heap.
+//
+// Mutator and garbage collection activities tend to scramble the content of regions.  Twice, during each GC pass, we rebuild
+// the free set in an effort to restore the efficient segregation of Collector and Mutator regions:
+//
+//  1. At the start of evacuation, we know exactly how much memory is going to be evacuated, and this guides our
+//     sizing of the Collector free set.
+//
+//  2. At the end of GC, we have reclaimed all of the memory that was spanned by the cset.  We rebuild here to make
+//     sure there is enough memory reserved at the high end of memory to hold the objects that might need to be evacuated
+//     during the next GC pass.
 
 class ShenandoahFreeSet : public CHeapObj<mtGC> {
 private:
   ShenandoahHeap* const _heap;
-  CHeapBitMap _mutator_free_bitmap;
-  CHeapBitMap _collector_free_bitmap;
-  size_t _max;
-
-  // Left-most and right-most region indexes. There are no free regions outside
-  // of [left-most; right-most] index intervals
-  size_t _mutator_leftmost, _mutator_rightmost;
-  size_t _collector_leftmost, _collector_rightmost;
+  ShenandoahRegionPartitions _partitions;
 
-  size_t _capacity;
-  size_t _used;
+  // Mutator allocations are biased from left-to-right or from right-to-left based on which end of mutator range
+  // is most likely to hold partially used regions.  In general, we want to finish consuming partially used
+  // regions and retire them in order to reduce the regions that must be searched for each allocation request.
+  bool _right_to_left_bias;
 
-  void assert_bounds() const NOT_DEBUG_RETURN;
+  // We re-evaluate the left-to-right allocation bias whenever _alloc_bias_weight is less than zero.  Each time
+  // we allocate an object, we decrement the count of this value.  Each time we re-evaluate whether to allocate
+  // from right-to-left or left-to-right, we reset the value of this counter to _InitialAllocBiasWeight.
+  ssize_t _alloc_bias_weight;
 
-  bool is_mutator_free(size_t idx) const;
-  bool is_collector_free(size_t idx) const;
+  const ssize_t _InitialAllocBiasWeight = 256;
 
   HeapWord* try_allocate_in(ShenandoahHeapRegion* region, ShenandoahAllocRequest& req, bool& in_new_region);
+
+  // While holding the heap lock, allocate memory for a single object or LAB  which is to be entirely contained
+  // within a single HeapRegion as characterized by req.
+  //
+  // Precondition: req.size() <= ShenandoahHeapRegion::humongous_threshold_words().
   HeapWord* allocate_single(ShenandoahAllocRequest& req, bool& in_new_region);
+
+  // While holding the heap lock, allocate memory for a humongous object which spans one or more regions that
+  // were previously empty.  Regions that represent humongous objects are entirely dedicated to the humongous
+  // object.  No other objects are packed into these regions.
+  //
+  // Precondition: req.size() > ShenandoahHeapRegion::humongous_threshold_words().
   HeapWord* allocate_contiguous(ShenandoahAllocRequest& req);
 
+  // Change region r from the Mutator partition to the GC's Collector partition.  This requires that the region is entirely empty.
+  // Typical usage: During evacuation, the GC may find it needs more memory than had been reserved at the start of evacuation to
+  // hold evacuated objects.  If this occurs and memory is still available in the Mutator's free set, we will flip a region from
+  // the Mutator free set into the Collector free set.
   void flip_to_gc(ShenandoahHeapRegion* r);
+  void clear_internal();
+  void try_recycle_trashed(ShenandoahHeapRegion *r);
 
-  void recompute_bounds();
-  void adjust_bounds();
-  bool touches_bounds(size_t num) const;
+  // Returns true iff this region is entirely available, either because it is empty() or because it has been found to represent
+  // immediate trash and we'll be able to immediately recycle it.  Note that we cannot recycle immediate trash if
+  // concurrent weak root processing is in progress.
+  inline bool can_allocate_from(ShenandoahHeapRegion *r) const;
+  inline bool can_allocate_from(size_t idx) const;
 
-  void increase_used(size_t amount);
-  void clear_internal();
+  inline bool has_alloc_capacity(ShenandoahHeapRegion *r) const;
 
-  size_t collector_count() const { return _collector_free_bitmap.count_one_bits(); }
-  size_t mutator_count()   const { return _mutator_free_bitmap.count_one_bits();   }
+  // This function places all regions that have allocation capacity into the mutator_partition, identifying regions
+  // that have no allocation capacity as NotFree.  Subsequently, we will move some of the mutator regions into the
+  // collector partition with the intent of packing collector memory into the highest (rightmost) addresses of the
+  // heap, with mutator memory consuming the lowest addresses of the heap.
+  void find_regions_with_alloc_capacity(size_t &cset_regions);
 
-  void try_recycle_trashed(ShenandoahHeapRegion *r);
+  // Having placed all regions that have allocation capacity into the mutator partition, move some of these regions from
+  // the mutator partition into the collector partition in order to assure that the memory available for allocations within
+  // the collector partition is at least to_reserve.
+  void reserve_regions(size_t to_reserve);
 
-  bool can_allocate_from(ShenandoahHeapRegion *r);
-  size_t alloc_capacity(ShenandoahHeapRegion *r);
-  bool has_no_alloc_capacity(ShenandoahHeapRegion *r);
+  // Overwrite arguments to represent the number of regions to be reclaimed from the cset
+  void prepare_to_rebuild(size_t &cset_regions);
+
+  void finish_rebuild(size_t cset_regions);
 
 public:
   ShenandoahFreeSet(ShenandoahHeap* heap, size_t max_regions);
 
+  // Public because ShenandoahRegionPartitions assertions require access.
+  inline size_t alloc_capacity(ShenandoahHeapRegion *r) const;
+  inline size_t alloc_capacity(size_t idx) const;
+
   void clear();
   void rebuild();
 
-  void recycle_trash();
+  // Move up to cset_regions number of regions from being available to the collector to being available to the mutator.
+  //
+  // Typical usage: At the end of evacuation, when the collector no longer needs the regions that had been reserved
+  // for evacuation, invoke this to make regions available for mutator allocations.
+  //
+  // Note that we plan to replenish the Collector reserve at the end of update refs, at which time all
+  // of the regions recycled from the collection set will be available.  If the very unlikely event that there
+  // are fewer regions in the collection set than remain in the collector set, we limit the transfer in order
+  // to assure that the replenished Collector reserve can be sufficiently large.
+  void move_regions_from_collector_to_mutator(size_t cset_regions);
 
+  void recycle_trash();
   void log_status();
 
-  size_t capacity()  const { return _capacity; }
-  size_t used()      const { return _used;     }
-  size_t available() const {
-    assert(_used <= _capacity, "must use less than capacity");
-    return _capacity - _used;
+  inline size_t capacity()  const { return _partitions.capacity_of(ShenandoahFreeSetPartitionId::Mutator); }
+  inline size_t used()      const { return _partitions.used_by(ShenandoahFreeSetPartitionId::Mutator);     }
+  inline size_t available() const {
+    assert(used() <= capacity(), "must use less than capacity");
+    return capacity() - used();
   }
 
   HeapWord* allocate(ShenandoahAllocRequest& req, bool& in_new_region);
   size_t unsafe_peek_free() const;
 
+  /*
+   * Internal fragmentation metric: describes how fragmented the heap regions are.
+   *
+   * It is derived as:
+   *
+   *               sum(used[i]^2, i=0..k)
+   *   IF = 1 - ------------------------------
+   *              C * sum(used[i], i=0..k)
+   *
+   * ...where k is the number of regions in computation, C is the region capacity, and
+   * used[i] is the used space in the region.
+   *
+   * The non-linearity causes IF to be lower for the cases where the same total heap
+   * used is densely packed. For example:
+   *   a) Heap is completely full  => IF = 0
+   *   b) Heap is half full, first 50% regions are completely full => IF = 0
+   *   c) Heap is half full, each region is 50% full => IF = 1/2
+   *   d) Heap is quarter full, first 50% regions are completely full => IF = 0
+   *   e) Heap is quarter full, each region is 25% full => IF = 3/4
+   *   f) Heap has one small object per each region => IF =~ 1
+   */
   double internal_fragmentation();
+
+  /*
+   * External fragmentation metric: describes how fragmented the heap is.
+   *
+   * It is derived as:
+   *
+   *   EF = 1 - largest_contiguous_free / total_free
+   *
+   * For example:
+   *   a) Heap is completely empty => EF = 0
+   *   b) Heap is completely full => EF = 0
+   *   c) Heap is first-half full => EF = 1/2
+   *   d) Heap is half full, full and empty regions interleave => EF =~ 1
+   */
   double external_fragmentation();
 
   void print_on(outputStream* out) const;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
index 2aeec0911d0..de7d81d0f43 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
@@ -912,7 +912,6 @@ class ShenandoahPostCompactClosure : public ShenandoahHeapRegionClosure {
 
 public:
   ShenandoahPostCompactClosure() : _heap(ShenandoahHeap::heap()), _live(0) {
-    _heap->free_set()->clear();
   }
 
   void heap_region_do(ShenandoahHeapRegion* r) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index c9d3d1d9364..f270e16f53e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -1119,6 +1119,83 @@ void ShenandoahHeap::evacuate_collection_set(bool concurrent) {
   workers()->run_task(&task);
 }
 
+oop ShenandoahHeap::evacuate_object(oop p, Thread* thread) {
+  if (ShenandoahThreadLocalData::is_oom_during_evac(Thread::current())) {
+    // This thread went through the OOM during evac protocol and it is safe to return
+    // the forward pointer. It must not attempt to evacuate any more.
+    return ShenandoahBarrierSet::resolve_forwarded(p);
+  }
+
+  assert(ShenandoahThreadLocalData::is_evac_allowed(thread), "must be enclosed in oom-evac scope");
+
+  size_t size = p->size();
+
+  assert(!heap_region_containing(p)->is_humongous(), "never evacuate humongous objects");
+
+  bool alloc_from_gclab = true;
+  HeapWord* copy = nullptr;
+
+#ifdef ASSERT
+  if (ShenandoahOOMDuringEvacALot &&
+      (os::random() & 1) == 0) { // Simulate OOM every ~2nd slow-path call
+    copy = nullptr;
+  } else {
+#endif
+    if (UseTLAB) {
+      copy = allocate_from_gclab(thread, size);
+    }
+    if (copy == nullptr) {
+      ShenandoahAllocRequest req = ShenandoahAllocRequest::for_shared_gc(size);
+      copy = allocate_memory(req);
+      alloc_from_gclab = false;
+    }
+#ifdef ASSERT
+  }
+#endif
+
+  if (copy == nullptr) {
+    control_thread()->handle_alloc_failure_evac(size);
+
+    _oom_evac_handler.handle_out_of_memory_during_evacuation();
+
+    return ShenandoahBarrierSet::resolve_forwarded(p);
+  }
+
+  // Copy the object:
+  Copy::aligned_disjoint_words(cast_from_oop<HeapWord*>(p), copy, size);
+
+  // Try to install the new forwarding pointer.
+  oop copy_val = cast_to_oop(copy);
+  ContinuationGCSupport::relativize_stack_chunk(copy_val);
+
+  oop result = ShenandoahForwarding::try_update_forwardee(p, copy_val);
+  if (result == copy_val) {
+    // Successfully evacuated. Our copy is now the public one!
+    shenandoah_assert_correct(nullptr, copy_val);
+    return copy_val;
+  }  else {
+    // Failed to evacuate. We need to deal with the object that is left behind. Since this
+    // new allocation is certainly after TAMS, it will be considered live in the next cycle.
+    // But if it happens to contain references to evacuated regions, those references would
+    // not get updated for this stale copy during this cycle, and we will crash while scanning
+    // it the next cycle.
+    //
+    // For GCLAB allocations, it is enough to rollback the allocation ptr. Either the next
+    // object will overwrite this stale copy, or the filler object on LAB retirement will
+    // do this. For non-GCLAB allocations, we have no way to retract the allocation, and
+    // have to explicitly overwrite the copy with the filler object. With that overwrite,
+    // we have to keep the fwdptr initialized and pointing to our (stale) copy.
+    if (alloc_from_gclab) {
+      ShenandoahThreadLocalData::gclab(thread)->undo_allocation(copy, size);
+    } else {
+      fill_with_object(copy, size);
+      shenandoah_assert_correct(nullptr, copy_val);
+    }
+    shenandoah_assert_correct(nullptr, result);
+    return result;
+  }
+}
+
 void ShenandoahHeap::trash_cset_regions() {
   ShenandoahHeapLocker locker(lock());
 
@@ -1291,7 +1368,14 @@ void ShenandoahHeap::prepare_for_verify() {
 }
 
 void ShenandoahHeap::gc_threads_do(ThreadClosure* tcl) const {
-  tcl->do_thread(_control_thread);
+  if (_shenandoah_policy->is_at_shutdown()) {
+    return;
+  }
+
+  if (_control_thread != nullptr) {
+    tcl->do_thread(_control_thread);
+  }
+
   workers()->threads_do(tcl);
   if (_safepoint_workers != nullptr) {
     _safepoint_workers->threads_do(tcl);
@@ -1637,29 +1721,6 @@ void ShenandoahHeap::parallel_heap_region_iterate(ShenandoahHeapRegionClosure* b
   }
 }
 
-class ShenandoahInitMarkUpdateRegionStateClosure : public ShenandoahHeapRegionClosure {
-private:
-  ShenandoahMarkingContext* const _ctx;
-public:
-  ShenandoahInitMarkUpdateRegionStateClosure() : _ctx(ShenandoahHeap::heap()->marking_context()) {}
-
-  void heap_region_do(ShenandoahHeapRegion* r) {
-    assert(!r->has_live(), "Region " SIZE_FORMAT " should have no live data", r->index());
-    if (r->is_active()) {
-      // Check if region needs updating its TAMS. We have updated it already during concurrent
-      // reset, so it is very likely we don't need to do another write here.
-      if (_ctx->top_at_mark_start(r) != r->top()) {
-        _ctx->capture_top_at_mark_start(r);
-      }
-    } else {
-      assert(_ctx->top_at_mark_start(r) == r->top(),
-             "Region " SIZE_FORMAT " should already have correct TAMS", r->index());
-    }
-  }
-
-  bool is_thread_safe() { return true; }
-};
-
 class ShenandoahRendezvousClosure : public HandshakeClosure {
 public:
   inline ShenandoahRendezvousClosure() : HandshakeClosure("ShenandoahRendezvous") {}
@@ -1871,7 +1932,7 @@ uint ShenandoahHeap::max_workers() {
 void ShenandoahHeap::stop() {
   // The shutdown sequence should be able to terminate when GC is running.
 
-  // Step 0. Notify policy to disable event recording.
+  // Step 0. Notify policy to disable event recording and prevent visiting gc threads during shutdown
   _shenandoah_policy->record_shutdown();
 
   // Step 1. Notify control thread that we are in shutdown.
@@ -2119,17 +2180,27 @@ class ShenandoahUpdateHeapRefsTask : public WorkerTask {
     if (CONCURRENT) {
       ShenandoahConcurrentWorkerSession worker_session(worker_id);
       ShenandoahSuspendibleThreadSetJoiner stsj;
-      do_work<ShenandoahConcUpdateRefsClosure>();
+      do_work<ShenandoahConcUpdateRefsClosure>(worker_id);
     } else {
       ShenandoahParallelWorkerSession worker_session(worker_id);
-      do_work<ShenandoahSTWUpdateRefsClosure>();
+      do_work<ShenandoahSTWUpdateRefsClosure>(worker_id);
     }
   }
 
 private:
   template<class T>
-  void do_work() {
+  void do_work(uint worker_id) {
     T cl;
+    if (CONCURRENT && (worker_id == 0)) {
+      // We ask the first worker to replenish the Mutator free set by moving regions previously reserved to hold the
+      // results of evacuation.  These reserves are no longer necessary because evacuation has completed.
+      size_t cset_regions = _heap->collection_set()->count();
+      // We cannot transfer any more regions than will be reclaimed when the existing collection set is recycled because
+      // we need the reclaimed collection set regions to replenish the collector reserves
+      _heap->free_set()->move_regions_from_collector_to_mutator(cset_regions);
+    }
+    // If !CONCURRENT, there's no value in expanding Mutator free set
+
     ShenandoahHeapRegion* r = _regions->next();
     ShenandoahMarkingContext* const ctx = _heap->complete_marking_context();
     while (r != nullptr) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
index e30b1d12e77..f3625da218c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
@@ -639,7 +639,7 @@ class ShenandoahHeap : public CollectedHeap, public ShenandoahSpaceInfo {
 
   // Evacuates object src. Returns the evacuated object, either evacuated
   // by this thread, or by some other thread.
-  inline oop evacuate_object(oop src, Thread* thread);
+  oop evacuate_object(oop src, Thread* thread);
 
   // Call before/after evacuation.
   inline void enter_evacuation(Thread* t);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
index 87c3ea50ba6..f2cc602d8cb 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
@@ -287,83 +287,6 @@ inline HeapWord* ShenandoahHeap::allocate_from_gclab(Thread* thread, size_t size
   return allocate_from_gclab_slow(thread, size);
 }
 
-inline oop ShenandoahHeap::evacuate_object(oop p, Thread* thread) {
-  if (ShenandoahThreadLocalData::is_oom_during_evac(Thread::current())) {
-    // This thread went through the OOM during evac protocol and it is safe to return
-    // the forward pointer. It must not attempt to evacuate any more.
-    return ShenandoahBarrierSet::resolve_forwarded(p);
-  }
-
-  assert(ShenandoahThreadLocalData::is_evac_allowed(thread), "must be enclosed in oom-evac scope");
-
-  size_t size = p->size();
-
-  assert(!heap_region_containing(p)->is_humongous(), "never evacuate humongous objects");
-
-  bool alloc_from_gclab = true;
-  HeapWord* copy = nullptr;
-
-#ifdef ASSERT
-  if (ShenandoahOOMDuringEvacALot &&
-      (os::random() & 1) == 0) { // Simulate OOM every ~2nd slow-path call
-        copy = nullptr;
-  } else {
-#endif
-    if (UseTLAB) {
-      copy = allocate_from_gclab(thread, size);
-    }
-    if (copy == nullptr) {
-      ShenandoahAllocRequest req = ShenandoahAllocRequest::for_shared_gc(size);
-      copy = allocate_memory(req);
-      alloc_from_gclab = false;
-    }
-#ifdef ASSERT
-  }
-#endif
-
-  if (copy == nullptr) {
-    control_thread()->handle_alloc_failure_evac(size);
-
-    _oom_evac_handler.handle_out_of_memory_during_evacuation();
-
-    return ShenandoahBarrierSet::resolve_forwarded(p);
-  }
-
-  // Copy the object:
-  Copy::aligned_disjoint_words(cast_from_oop<HeapWord*>(p), copy, size);
-
-  // Try to install the new forwarding pointer.
-  oop copy_val = cast_to_oop(copy);
-  ContinuationGCSupport::relativize_stack_chunk(copy_val);
-
-  oop result = ShenandoahForwarding::try_update_forwardee(p, copy_val);
-  if (result == copy_val) {
-    // Successfully evacuated. Our copy is now the public one!
-    shenandoah_assert_correct(nullptr, copy_val);
-    return copy_val;
-  }  else {
-    // Failed to evacuate. We need to deal with the object that is left behind. Since this
-    // new allocation is certainly after TAMS, it will be considered live in the next cycle.
-    // But if it happens to contain references to evacuated regions, those references would
-    // not get updated for this stale copy during this cycle, and we will crash while scanning
-    // it the next cycle.
-    //
-    // For GCLAB allocations, it is enough to rollback the allocation ptr. Either the next
-    // object will overwrite this stale copy, or the filler object on LAB retirement will
-    // do this. For non-GCLAB allocations, we have no way to retract the allocation, and
-    // have to explicitly overwrite the copy with the filler object. With that overwrite,
-    // we have to keep the fwdptr initialized and pointing to our (stale) copy.
-    if (alloc_from_gclab) {
-      ShenandoahThreadLocalData::gclab(thread)->undo_allocation(copy, size);
-    } else {
-      fill_with_object(copy, size);
-      shenandoah_assert_correct(nullptr, copy_val);
-    }
-    shenandoah_assert_correct(nullptr, result);
-    return result;
-  }
-}
-
 inline bool ShenandoahHeap::requires_marking(const void* entry) const {
   oop obj = cast_to_oop(entry);
   return !_marking_context->is_marked_strong(obj);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.cpp
new file mode 100644
index 00000000000..c3e8108752f
--- /dev/null
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.cpp
@@ -0,0 +1,291 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc/shenandoah/shenandoahSimpleBitMap.hpp"
+
+ShenandoahSimpleBitMap::ShenandoahSimpleBitMap(size_t num_bits) :
+    _num_bits(num_bits),
+    _num_words(align_up(num_bits, BitsPerWord) / BitsPerWord),
+    _bitmap(NEW_C_HEAP_ARRAY(uintx, _num_words, mtGC))
+{
+  clear_all();
+}
+
+ShenandoahSimpleBitMap::~ShenandoahSimpleBitMap() {
+  if (_bitmap != nullptr) {
+    FREE_C_HEAP_ARRAY(uintx, _bitmap);
+  }
+}
+
+size_t ShenandoahSimpleBitMap::count_leading_ones(idx_t start_idx) const {
+  assert((start_idx >= 0) && (start_idx < _num_bits), "precondition");
+  size_t array_idx = start_idx >> LogBitsPerWord;
+  uintx element_bits = _bitmap[array_idx];
+  uintx bit_number = start_idx & right_n_bits(LogBitsPerWord);
+  uintx mask = ~right_n_bits(bit_number);
+  size_t counted_ones = 0;
+  while ((element_bits & mask) == mask) {
+    // All bits numbered >= bit_number are set
+    size_t found_ones = BitsPerWord - bit_number;
+    counted_ones += found_ones;
+    // Dead code: do not need to compute: start_idx += found_ones;
+    // Strength reduction:                array_idx = (start_idx >> LogBitsPerWord)
+    array_idx++;
+    element_bits = _bitmap[array_idx];
+    // Constant folding:                  bit_number = start_idx & right_n_bits(LogBitsPerWord);
+    bit_number = 0;
+    // Constant folding:                  mask = ~right_n_bits(bit_number);
+    mask = ~0;
+  }
+
+  // Add in number of consecutive ones starting with the_bit and including more significant bits and return result
+  uintx aligned = element_bits >> bit_number;
+  uintx complement = ~aligned;
+  return counted_ones + count_trailing_zeros<uintx>(complement);
+}
+
+size_t ShenandoahSimpleBitMap::count_trailing_ones(idx_t last_idx) const {
+  assert((last_idx >= 0) && (last_idx < _num_bits), "precondition");
+  size_t array_idx = last_idx >> LogBitsPerWord;
+  uintx element_bits = _bitmap[array_idx];
+  uintx bit_number = last_idx & right_n_bits(LogBitsPerWord);
+  // All ones from bit 0 to the_bit
+  uintx mask = right_n_bits(bit_number + 1);
+  size_t counted_ones = 0;
+  while ((element_bits & mask) == mask) {
+    // All bits numbered <= bit_number are set
+    size_t found_ones = bit_number + 1;
+    counted_ones += found_ones;
+    // Dead code: do not need to compute: last_idx -= found_ones;
+    array_idx--;
+    element_bits = _bitmap[array_idx];
+    // Constant folding:                  bit_number = last_idx & right_n_bits(LogBitsPerWord);
+    bit_number = BitsPerWord - 1;
+    // Constant folding:                  mask = right_n_bits(bit_number + 1);
+    mask = ~0;
+  }
+
+  // Add in number of consecutive ones starting with the_bit and including less significant bits and return result
+  uintx aligned = element_bits << (BitsPerWord - (bit_number + 1));
+  uintx complement = ~aligned;
+  return counted_ones + count_leading_zeros<uintx>(complement);
+}
+
+bool ShenandoahSimpleBitMap::is_forward_consecutive_ones(idx_t start_idx, idx_t count) const {
+  while (count > 0) {
+    assert((start_idx >= 0) && (start_idx < _num_bits), "precondition: start_idx: " SSIZE_FORMAT ", count: " SSIZE_FORMAT,
+           start_idx, count);
+    assert(start_idx + count <= (idx_t) _num_bits, "precondition");
+    size_t array_idx = start_idx >> LogBitsPerWord;
+    uintx bit_number = start_idx & right_n_bits(LogBitsPerWord);
+    uintx element_bits = _bitmap[array_idx];
+    uintx bits_to_examine  = BitsPerWord - bit_number;
+    element_bits >>= bit_number;
+    uintx complement = ~element_bits;
+    uintx trailing_ones;
+    if (complement != 0) {
+      trailing_ones = count_trailing_zeros<uintx>(complement);
+    } else {
+      trailing_ones = bits_to_examine;
+    }
+    if (trailing_ones >= (uintx) count) {
+      return true;
+    } else if (trailing_ones == bits_to_examine) {
+      start_idx += bits_to_examine;
+      count -= bits_to_examine;
+      // Repeat search with smaller goal
+    } else {
+      return false;
+    }
+  }
+  return true;
+}
+
+bool ShenandoahSimpleBitMap::is_backward_consecutive_ones(idx_t last_idx, idx_t count) const {
+  while (count > 0) {
+    assert((last_idx >= 0) && (last_idx < _num_bits), "precondition");
+    assert(last_idx - count >= -1, "precondition");
+    size_t array_idx = last_idx >> LogBitsPerWord;
+    uintx bit_number = last_idx & right_n_bits(LogBitsPerWord);
+    uintx element_bits = _bitmap[array_idx];
+    uintx bits_to_examine = bit_number + 1;
+    element_bits <<= (BitsPerWord - bits_to_examine);
+    uintx complement = ~element_bits;
+    uintx leading_ones;
+    if (complement != 0) {
+      leading_ones = count_leading_zeros<uintx>(complement);
+    } else {
+      leading_ones = bits_to_examine;
+    }
+    if (leading_ones >= (uintx) count) {
+      return true;
+    } else if (leading_ones == bits_to_examine) {
+      last_idx -= leading_ones;
+      count -= leading_ones;
+      // Repeat search with smaller goal
+    } else {
+      return false;
+    }
+  }
+  return true;
+}
+
+idx_t ShenandoahSimpleBitMap::find_first_consecutive_set_bits(idx_t beg, idx_t end, size_t num_bits) const {
+  assert((beg >= 0) && (beg < _num_bits), "precondition");
+
+  // Stop looking if there are not num_bits remaining in probe space.
+  idx_t start_boundary = end - num_bits;
+  if (beg > start_boundary) {
+    return end;
+  }
+  uintx array_idx = beg >> LogBitsPerWord;
+  uintx bit_number = beg & right_n_bits(LogBitsPerWord);
+  uintx element_bits = _bitmap[array_idx];
+  if (bit_number > 0) {
+    uintx mask_out = right_n_bits(bit_number);
+    element_bits &= ~mask_out;
+  }
+
+  // The following loop minimizes the number of spans probed in order to find num_bits consecutive bits.
+  // For example, if bit_number = beg = 0, num_bits = 8, and element bits equals 00111111_11000000_00000000_10011000B,
+  // we need only 3 probes to find the match at bit offset 22.
+  //
+  // Let beg = 0
+  // element_bits = 00111111_11000000_00000000_10011000B;
+  //                                           ________   (the searched span)
+  //                                           ^   ^  ^- bit_number = beg = 0
+  //                                           |   +-- next_start_candidate_1 (where next 1 is found)
+  //                                           +------ next_start_candidate_2 (start of the trailing 1s within span)
+  // Let beg = 7
+  // element_bits = 00111111_11000000_00000000_10011000B;
+  //                          ^       ^_________   (the searched span)
+  //                          |       |        ^- bit_number = beg = 7
+  //                          |       +---------- next_start_candidate_2 (there are no trailing 1s within span)
+  //                          +------------------ next_start_candidate_1 (where next 1 is found)
+  // Let beg = 22
+  // Let beg = 22
+  // element_bits = 00111111_11000001_11111100_10011000B;
+  //                  _________   (the searched span)
+  //                          ^- bit_number = beg = 18
+  // Here, is_forward_consecutive_ones(22, 8) succeeds and we report the match
+
+  while (true) {
+    if (element_bits == 0) {
+      // move to the next element
+      beg += BitsPerWord - bit_number;
+      if (beg > start_boundary) {
+        // No match found.
+        return end;
+      }
+      array_idx++;
+      bit_number = 0;
+      element_bits = _bitmap[array_idx];
+    } else if (is_forward_consecutive_ones(beg, num_bits)) {
+      return beg;
+    } else {
+      // There is at least one non-zero bit within the masked element_bits. Arrange to skip over bits that
+      // cannot be part of a consecutive-ones match.
+      uintx next_set_bit = count_trailing_zeros<uintx>(element_bits);
+      uintx next_start_candidate_1 = (array_idx << LogBitsPerWord) + next_set_bit;
+
+      // There is at least one zero bit in this span. Align the next probe at the start of trailing ones for probed span,
+      // or align at end of span if this span has no trailing ones.
+      size_t trailing_ones = count_trailing_ones(beg + num_bits - 1);
+      uintx next_start_candidate_2 = beg + num_bits - trailing_ones;
+
+      beg = MAX2(next_start_candidate_1, next_start_candidate_2);
+      if (beg > start_boundary) {
+        // No match found.
+        return end;
+      }
+      array_idx = beg >> LogBitsPerWord;
+      element_bits = _bitmap[array_idx];
+      bit_number = beg & right_n_bits(LogBitsPerWord);
+      if (bit_number > 0) {
+        size_t mask_out = right_n_bits(bit_number);
+        element_bits &= ~mask_out;
+      }
+    }
+  }
+}
+
+idx_t ShenandoahSimpleBitMap::find_last_consecutive_set_bits(const idx_t beg, idx_t end, const size_t num_bits) const {
+
+  assert((end >= 0) && (end < _num_bits), "precondition");
+
+  // Stop looking if there are not num_bits remaining in probe space.
+  idx_t last_boundary = beg + num_bits;
+  if (end < last_boundary) {
+    return beg;
+  }
+
+  size_t array_idx = end >> LogBitsPerWord;
+  uintx bit_number = end & right_n_bits(LogBitsPerWord);
+  uintx element_bits = _bitmap[array_idx];
+  if (bit_number < BitsPerWord - 1) {
+    uintx mask_in = right_n_bits(bit_number + 1);
+    element_bits &= mask_in;
+  }
+
+  // See comment in find_first_consecutive_set_bits to understand how this loop works.
+  while (true) {
+    if (element_bits == 0) {
+      // move to the previous element
+      end -= bit_number + 1;
+      if (end < last_boundary) {
+        // No match found.
+        return beg;
+      }
+      array_idx--;
+      bit_number = BitsPerWord - 1;
+      element_bits = _bitmap[array_idx];
+    } else if (is_backward_consecutive_ones(end, num_bits)) {
+      return end + 1 - num_bits;
+    } else {
+      // There is at least one non-zero bit within the masked element_bits. Arrange to skip over bits that
+      // cannot be part of a consecutive-ones match.
+      uintx next_set_bit = BitsPerWord - (1 + count_leading_zeros<uintx>(element_bits));
+      uintx next_last_candidate_1 = (array_idx << LogBitsPerWord) + next_set_bit;
+
+      // There is at least one zero bit in this span.  Align the next probe at the end of leading ones for probed span,
+      // or align before start of span if this span has no leading ones.
+      size_t leading_ones = count_leading_ones(end - (num_bits - 1));
+      uintx next_last_candidate_2 = end - (num_bits - leading_ones);
+
+      end = MIN2(next_last_candidate_1, next_last_candidate_2);
+      if (end < last_boundary) {
+        // No match found.
+        return beg;
+      }
+      array_idx = end >> LogBitsPerWord;
+      bit_number = end & right_n_bits(LogBitsPerWord);
+      element_bits = _bitmap[array_idx];
+      if (bit_number < BitsPerWord - 1){
+        size_t mask_in = right_n_bits(bit_number + 1);
+        element_bits &= mask_in;
+      }
+    }
+  }
+}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.hpp
new file mode 100644
index 00000000000..c22e9527002
--- /dev/null
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.hpp
@@ -0,0 +1,170 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSIMPLEBITMAP_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHSIMPLEBITMAP_HPP
+
+#include <cstddef>
+
+#include "gc/shenandoah/shenandoahAsserts.hpp"
+
+// TODO: Merge the enhanced capabilities of ShenandoahSimpleBitMap into src/hotspot/share/utilities/bitMap.hpp
+//       and deprecate ShenandoahSimpleBitMap.  The key enhanced capabilities to be integrated include:
+//
+//   1. Allow searches from high to low memory (when biasing allocations towards the top of the heap)
+//   2. Allow searches for clusters of contiguous set bits (to expedite allocation for humongous objects)
+//
+// idx_t is defined here as ssize_t.  In src/hotspot/share/utiliities/bitMap.hpp, idx is defined as size_t.
+// This is a significant incompatibility.
+//
+// The API and internal implementation of ShenandoahSimpleBitMap and ShenandoahRegionPartitions use idx_t to
+// represent index, even though index is "inherently" unsigned.  There are two reasons for this choice:
+//  1. We use -1 as a sentinel value to represent empty partitions.  This same value may be used to represent
+//     failure to find a previous set bit or previous range of set bits.
+//  2. Certain loops are written most naturally if the iterator, which may hold the sentinel -1 value, can be
+//     declared as signed and the terminating condition can be < 0.
+
+typedef ssize_t idx_t;
+
+// ShenandoahSimpleBitMap resembles CHeapBitMap but adds missing support for find_first_consecutive_set_bits() and
+// find_last_consecutive_set_bits.  An alternative refactoring of code would subclass CHeapBitMap, but this might
+// break abstraction rules, because efficient implementation requires assumptions about superclass internals that
+// might be violatee through future software maintenance.
+class ShenandoahSimpleBitMap {
+  const idx_t _num_bits;
+  const size_t _num_words;
+  uintx* const _bitmap;
+
+public:
+  ShenandoahSimpleBitMap(size_t num_bits);
+
+  ~ShenandoahSimpleBitMap();
+
+  void clear_all() {
+    for (size_t i = 0; i < _num_words; i++) {
+      _bitmap[i] = 0;
+    }
+  }
+
+private:
+
+  // Count consecutive ones in forward order, starting from start_idx.  Requires that there is at least one zero
+  // between start_idx and index value (_num_bits - 1), inclusive.
+  size_t count_leading_ones(idx_t start_idx) const;
+
+  // Count consecutive ones in reverse order, starting from last_idx.  Requires that there is at least one zero
+  // between last_idx and index value zero, inclusive.
+  size_t count_trailing_ones(idx_t last_idx) const;
+
+  bool is_forward_consecutive_ones(idx_t start_idx, idx_t count) const;
+  bool is_backward_consecutive_ones(idx_t last_idx, idx_t count) const;
+
+public:
+
+  inline idx_t aligned_index(idx_t idx) const {
+    assert((idx >= 0) && (idx < _num_bits), "precondition");
+    idx_t array_idx = idx & ~right_n_bits(LogBitsPerWord);
+    return array_idx;
+  }
+
+  inline constexpr idx_t alignment() const {
+    return BitsPerWord;
+  }
+
+  // For testing
+  inline idx_t size() const {
+    return _num_bits;
+  }
+
+  // Return the word that holds idx bit and its neighboring bits.
+  inline uintx bits_at(idx_t idx) const {
+    assert((idx >= 0) && (idx < _num_bits), "precondition");
+    idx_t array_idx = idx >> LogBitsPerWord;
+    return _bitmap[array_idx];
+  }
+
+  inline void set_bit(idx_t idx) {
+    assert((idx >= 0) && (idx < _num_bits), "precondition");
+    size_t array_idx = idx >> LogBitsPerWord;
+    uintx bit_number = idx & right_n_bits(LogBitsPerWord);
+    uintx the_bit = nth_bit(bit_number);
+    _bitmap[array_idx] |= the_bit;
+  }
+
+  inline void clear_bit(idx_t idx) {
+    assert((idx >= 0) && (idx < _num_bits), "precondition");
+    assert(idx >= 0, "precondition");
+    size_t array_idx = idx >> LogBitsPerWord;
+    uintx bit_number = idx & right_n_bits(LogBitsPerWord);
+    uintx the_bit = nth_bit(bit_number);
+    _bitmap[array_idx] &= ~the_bit;
+  }
+
+  inline bool is_set(idx_t idx) const {
+    assert((idx >= 0) && (idx < _num_bits), "precondition");
+    assert(idx >= 0, "precondition");
+    size_t array_idx = idx >> LogBitsPerWord;
+    uintx bit_number = idx & right_n_bits(LogBitsPerWord);
+    uintx the_bit = nth_bit(bit_number);
+    return (_bitmap[array_idx] & the_bit)? true: false;
+  }
+
+  // Return the index of the first set bit in the range [beg, size()), or size() if none found.
+  // precondition: beg and end form a valid range for the bitmap.
+  inline idx_t find_first_set_bit(idx_t beg) const;
+
+  // Return the index of the first set bit in the range [beg, end), or end if none found.
+  // precondition: beg and end form a valid range for the bitmap.
+  inline idx_t find_first_set_bit(idx_t beg, idx_t end) const;
+
+  // Return the index of the last set bit in the range (-1, end], or -1 if none found.
+  // precondition: beg and end form a valid range for the bitmap.
+  inline idx_t find_last_set_bit(idx_t end) const;
+
+  // Return the index of the last set bit in the range (beg, end], or beg if none found.
+  // precondition: beg and end form a valid range for the bitmap.
+  inline idx_t find_last_set_bit(idx_t beg, idx_t end) const;
+
+  // Return the start index of the first run of <num_bits> consecutive set bits for which the first set bit is within
+  //   the range [beg, size()), or size() if the run of <num_bits> is not found within this range.
+  // precondition: beg is within the valid range for the bitmap.
+  inline idx_t find_first_consecutive_set_bits(idx_t beg, size_t num_bits) const;
+
+  // Return the start index of the first run of <num_bits> consecutive set bits for which the first set bit is within
+  //   the range [beg, end), or end if the run of <num_bits> is not found within this range.
+  // precondition: beg and end form a valid range for the bitmap.
+  idx_t find_first_consecutive_set_bits(idx_t beg, idx_t end, size_t num_bits) const;
+
+  // Return the start index of the last run of <num_bits> consecutive set bits for which the entire run of set bits is within
+  // the range (-1, end], or -1 if the run of <num_bits> is not found within this range.
+  // precondition: end is within the valid range for the bitmap.
+  inline idx_t find_last_consecutive_set_bits(idx_t end, size_t num_bits) const;
+
+  // Return the start index of the first run of <num_bits> consecutive set bits for which the entire run of set bits is within
+  // the range (beg, end], or beg if the run of <num_bits> is not found within this range.
+  // precondition: beg and end form a valid range for the bitmap.
+  idx_t find_last_consecutive_set_bits(idx_t beg, idx_t end, size_t num_bits) const;
+};
+
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHSIMPLEBITMAP_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.inline.hpp
new file mode 100644
index 00000000000..3e602ed11e0
--- /dev/null
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.inline.hpp
@@ -0,0 +1,100 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSIMPLEBITMAP_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHSIMPLEBITMAP_INLINE_HPP
+
+#include "gc/shenandoah/shenandoahSimpleBitMap.hpp"
+
+inline idx_t ShenandoahSimpleBitMap::find_first_set_bit(idx_t beg, idx_t end) const {
+  assert((beg >= 0) && (beg < _num_bits), "precondition");
+  assert((end > beg) && (end <= _num_bits), "precondition");
+  do {
+    size_t array_idx = beg >> LogBitsPerWord;
+    uintx bit_number = beg & right_n_bits(LogBitsPerWord);
+    uintx element_bits = _bitmap[array_idx];
+    if (bit_number > 0) {
+      uintx mask_out = right_n_bits(bit_number);
+      element_bits &= ~mask_out;
+    }
+    if (element_bits) {
+      // The next set bit is here.  Find first set bit >= bit_number;
+      uintx aligned = element_bits >> bit_number;
+      uintx first_set_bit = count_trailing_zeros<uintx>(aligned);
+      idx_t candidate_result = (array_idx * BitsPerWord) + bit_number + first_set_bit;
+      return (candidate_result < end)? candidate_result: end;
+    } else {
+      // Next bit is not here.  Try the next array element
+      beg += BitsPerWord - bit_number;
+    }
+  } while (beg < end);
+  return end;
+}
+
+inline idx_t ShenandoahSimpleBitMap::find_first_set_bit(idx_t beg) const {
+  assert((beg >= 0) && (beg < size()), "precondition");
+  return find_first_set_bit(beg, size());
+}
+
+inline idx_t ShenandoahSimpleBitMap::find_last_set_bit(idx_t beg, idx_t end) const {
+  assert((end >= 0) && (end < _num_bits), "precondition");
+  assert((beg >= -1) && (beg < end), "precondition");
+  do {
+    idx_t array_idx = end >> LogBitsPerWord;
+    uintx bit_number = end & right_n_bits(LogBitsPerWord);
+    uintx element_bits = _bitmap[array_idx];
+    if (bit_number < BitsPerWord - 1){
+      uintx mask_in = right_n_bits(bit_number + 1);
+      element_bits &= mask_in;
+    }
+    if (element_bits) {
+      // The prev set bit is here.  Find the first set bit <= bit_number
+      uintx aligned = element_bits << (BitsPerWord - (bit_number + 1));
+      uintx first_set_bit = count_leading_zeros<uintx>(aligned);
+      idx_t candidate_result = array_idx * BitsPerWord + (bit_number - first_set_bit);
+      return (candidate_result > beg)? candidate_result: beg;
+    } else {
+      // Next bit is not here.  Try the previous array element
+      end -= (bit_number + 1);
+    }
+  } while (end > beg);
+  return beg;
+}
+
+inline idx_t ShenandoahSimpleBitMap::find_last_set_bit(idx_t end) const {
+  assert((end >= 0) && (end < _num_bits), "precondition");
+  return find_last_set_bit(-1, end);
+}
+
+inline idx_t ShenandoahSimpleBitMap::find_first_consecutive_set_bits(idx_t beg, size_t num_bits) const {
+  assert((beg >= 0) && (beg < _num_bits), "precondition");
+  return find_first_consecutive_set_bits(beg, size(), num_bits);
+}
+
+inline idx_t ShenandoahSimpleBitMap::find_last_consecutive_set_bits(idx_t end, size_t num_bits) const {
+  assert((end >= 0) && (end < _num_bits), "precondition");
+  return find_last_consecutive_set_bits((idx_t) -1, end, num_bits);
+}
+
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHSIMPLEBITMAP_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp b/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp
index eeeb1dcad19..af221550c69 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp
@@ -42,6 +42,9 @@ bool VM_ShenandoahOperation::doit_prologue() {
 
 void VM_ShenandoahOperation::doit_epilogue() {
   assert(!ShenandoahHeap::heap()->has_gc_state_changed(), "GC State was not synchronized to java threads.");
+  // GC thread root traversal likely used OopMapCache a lot, which
+  // might have created lots of old entries. Trigger the cleanup now.
+  OopMapCache::trigger_cleanup();
 }
 
 bool VM_ShenandoahReferenceOperation::doit_prologue() {
@@ -52,7 +55,6 @@ bool VM_ShenandoahReferenceOperation::doit_prologue() {
 
 void VM_ShenandoahReferenceOperation::doit_epilogue() {
   VM_ShenandoahOperation::doit_epilogue();
-  OopMapCache::cleanup_old_entries();
   if (Universe::has_reference_pending_list()) {
     Heap_lock->notify_all();
   }
diff --git a/src/hotspot/share/gc/x/xDriver.cpp b/src/hotspot/share/gc/x/xDriver.cpp
index b78e155d3a7..c477f4a135c 100644
--- a/src/hotspot/share/gc/x/xDriver.cpp
+++ b/src/hotspot/share/gc/x/xDriver.cpp
@@ -35,6 +35,7 @@
 #include "gc/x/xServiceability.hpp"
 #include "gc/x/xStat.hpp"
 #include "gc/x/xVerify.hpp"
+#include "interpreter/oopMapCache.hpp"
 #include "logging/log.hpp"
 #include "memory/universe.hpp"
 #include "runtime/threads.hpp"
@@ -130,6 +131,10 @@ class VM_XOperation : public VM_Operation {
 
   virtual void doit_epilogue() {
     Heap_lock->unlock();
+
+    // GC thread root traversal likely used OopMapCache a lot, which
+    // might have created lots of old entries. Trigger the cleanup now.
+    OopMapCache::trigger_cleanup();
   }
 
   bool gc_locked() const {
diff --git a/src/hotspot/share/gc/z/zGeneration.cpp b/src/hotspot/share/gc/z/zGeneration.cpp
index 049edc802cc..5c3afa9db8c 100644
--- a/src/hotspot/share/gc/z/zGeneration.cpp
+++ b/src/hotspot/share/gc/z/zGeneration.cpp
@@ -52,6 +52,7 @@
 #include "gc/z/zUncoloredRoot.inline.hpp"
 #include "gc/z/zVerify.hpp"
 #include "gc/z/zWorkers.hpp"
+#include "interpreter/oopMapCache.hpp"
 #include "logging/log.hpp"
 #include "memory/universe.hpp"
 #include "prims/jvmtiTagMap.hpp"
@@ -452,6 +453,10 @@ class VM_ZOperation : public VM_Operation {
 
   virtual void doit_epilogue() {
     Heap_lock->unlock();
+
+    // GC thread root traversal likely used OopMapCache a lot, which
+    // might have created lots of old entries. Trigger the cleanup now.
+    OopMapCache::trigger_cleanup();
   }
 
   bool success() const {
diff --git a/src/hotspot/share/gc/z/zObjArrayAllocator.cpp b/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
index 45f65f0e7e5..1b2f3804e3d 100644
--- a/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
+++ b/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
@@ -49,21 +49,8 @@ oop ZObjArrayAllocator::initialize(HeapWord* mem) const {
   // suggested that it offered a good trade-off between allocation
   // time and time-to-safepoint
   const size_t segment_max = ZUtils::bytes_to_words(64 * K);
-  const BasicType element_type = ArrayKlass::cast(_klass)->element_type();
-
-  // Clear leading 32 bits, if necessary.
-  int base_offset = arrayOopDesc::base_offset_in_bytes(element_type);
-  if (!is_aligned(base_offset, HeapWordSize)) {
-    assert(is_aligned(base_offset, BytesPerInt), "array base must be 32 bit aligned");
-    *reinterpret_cast<jint*>(reinterpret_cast<char*>(mem) + base_offset) = 0;
-    base_offset += BytesPerInt;
-  }
-  assert(is_aligned(base_offset, HeapWordSize), "remaining array base must be 64 bit aligned");
-
-  const size_t header = heap_word_size(base_offset);
-  const size_t payload_size = _word_size - header;
 
-  if (payload_size <= segment_max) {
+  if (_word_size <= segment_max) {
     // To small to use segmented clearing
     return ObjArrayAllocator::initialize(mem);
   }
@@ -88,6 +75,22 @@ oop ZObjArrayAllocator::initialize(HeapWord* mem) const {
   // over such objects.
   ZThreadLocalData::set_invisible_root(_thread, (zaddress_unsafe*)&mem);
 
+  const BasicType element_type = ArrayKlass::cast(_klass)->element_type();
+  const size_t base_offset_in_bytes = arrayOopDesc::base_offset_in_bytes(element_type);
+  const size_t process_start_offset_in_bytes = align_up(base_offset_in_bytes, BytesPerWord);
+
+  if (process_start_offset_in_bytes != base_offset_in_bytes) {
+    // initialize_memory can only fill word aligned memory,
+    // fill the first 4 bytes here.
+    assert(process_start_offset_in_bytes - base_offset_in_bytes == 4, "Must be 4-byte aligned");
+    assert(!is_reference_type(element_type), "Only TypeArrays can be 4-byte aligned");
+    *reinterpret_cast<int*>(reinterpret_cast<char*>(mem) + base_offset_in_bytes) = 0;
+  }
+
+  // Note: initialize_memory may clear padding bytes at the end
+  const size_t process_start_offset = ZUtils::bytes_to_words(process_start_offset_in_bytes);
+  const size_t process_size = _word_size - process_start_offset;
+
   uint32_t old_seqnum_before = ZGeneration::old()->seqnum();
   uint32_t young_seqnum_before = ZGeneration::young()->seqnum();
   uintptr_t color_before = ZPointerStoreGoodMask;
@@ -100,10 +103,10 @@ oop ZObjArrayAllocator::initialize(HeapWord* mem) const {
   bool seen_gc_safepoint = false;
 
   auto initialize_memory = [&]() {
-    for (size_t processed = 0; processed < payload_size; processed += segment_max) {
+    for (size_t processed = 0; processed < process_size; processed += segment_max) {
       // Clear segment
-      uintptr_t* const start = (uintptr_t*)(mem + header + processed);
-      const size_t remaining = payload_size - processed;
+      uintptr_t* const start = (uintptr_t*)(mem + process_start_offset + processed);
+      const size_t remaining = process_size - processed;
       const size_t segment = MIN2(remaining, segment_max);
       // Usually, the young marking code has the responsibility to color
       // raw nulls, before they end up in the old generation. However, the
diff --git a/src/hotspot/share/interpreter/oopMapCache.cpp b/src/hotspot/share/interpreter/oopMapCache.cpp
index 3c2f1dd3e35..cae0efae9b2 100644
--- a/src/hotspot/share/interpreter/oopMapCache.cpp
+++ b/src/hotspot/share/interpreter/oopMapCache.cpp
@@ -35,6 +35,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/signature.hpp"
+#include "utilities/globalCounter.inline.hpp"
 
 class OopMapCacheEntry: private InterpreterOopMap {
   friend class InterpreterOopMap;
@@ -494,15 +495,11 @@ void OopMapCache::flush_obsolete_entries() {
   }
 }
 
-// Called by GC for thread root scan during a safepoint only.  The other interpreted frame oopmaps
-// are generated locally and not cached.
+// Lookup or compute/cache the entry.
 void OopMapCache::lookup(const methodHandle& method,
                          int bci,
                          InterpreterOopMap* entry_for) {
-  assert(SafepointSynchronize::is_at_safepoint(), "called by GC in a safepoint");
   int probe = hash_value_for(method, bci);
-  int i;
-  OopMapCacheEntry* entry = nullptr;
 
   if (log_is_enabled(Debug, interpreter, oopmap)) {
     static int count = 0;
@@ -512,14 +509,18 @@ void OopMapCache::lookup(const methodHandle& method,
            method()->name_and_sig_as_C_string(), probe);
   }
 
-  // Search hashtable for match
-  for(i = 0; i < _probe_depth; i++) {
-    entry = entry_at(probe + i);
-    if (entry != nullptr && !entry->is_empty() && entry->match(method, bci)) {
-      entry_for->resource_copy(entry);
-      assert(!entry_for->is_empty(), "A non-empty oop map should be returned");
-      log_debug(interpreter, oopmap)("- found at hash %d", probe + i);
-      return;
+  // Search hashtable for match.
+  // Need a critical section to avoid race against concurrent reclamation.
+  {
+    GlobalCounter::CriticalSection cs(Thread::current());
+    for (int i = 0; i < _probe_depth; i++) {
+      OopMapCacheEntry *entry = entry_at(probe + i);
+      if (entry != nullptr && !entry->is_empty() && entry->match(method, bci)) {
+        entry_for->resource_copy(entry);
+        assert(!entry_for->is_empty(), "A non-empty oop map should be returned");
+        log_debug(interpreter, oopmap)("- found at hash %d", probe + i);
+        return;
+      }
     }
   }
 
@@ -541,8 +542,8 @@ void OopMapCache::lookup(const methodHandle& method,
   }
 
   // First search for an empty slot
-  for(i = 0; i < _probe_depth; i++) {
-    entry = entry_at(probe + i);
+  for (int i = 0; i < _probe_depth; i++) {
+    OopMapCacheEntry* entry = entry_at(probe + i);
     if (entry == nullptr) {
       if (put_at(probe + i, tmp, nullptr)) {
         assert(!entry_for->is_empty(), "A non-empty oop map should be returned");
@@ -557,6 +558,10 @@ void OopMapCache::lookup(const methodHandle& method,
   // where the first entry in the collision array is replaced with the new one.
   OopMapCacheEntry* old = entry_at(probe + 0);
   if (put_at(probe + 0, tmp, old)) {
+    // Cannot deallocate old entry on the spot: it can still be used by readers
+    // that got a reference to it before we were able to replace it in the map.
+    // Instead of synchronizing on GlobalCounter here and incurring heavy thread
+    // walk, we do this clean up out of band.
     enqueue_for_cleanup(old);
   } else {
     OopMapCacheEntry::deallocate(tmp);
@@ -567,13 +572,14 @@ void OopMapCache::lookup(const methodHandle& method,
 }
 
 void OopMapCache::enqueue_for_cleanup(OopMapCacheEntry* entry) {
-  bool success = false;
-  OopMapCacheEntry* head;
-  do {
-    head = _old_entries;
+  while (true) {
+    OopMapCacheEntry* head = Atomic::load(&_old_entries);
     entry->_next = head;
-    success = Atomic::cmpxchg(&_old_entries, head, entry) == head;
-  } while (!success);
+    if (Atomic::cmpxchg(&_old_entries, head, entry) == head) {
+      // Enqueued successfully.
+      break;
+    }
+  }
 
   if (log_is_enabled(Debug, interpreter, oopmap)) {
     ResourceMark rm;
@@ -582,11 +588,28 @@ void OopMapCache::enqueue_for_cleanup(OopMapCacheEntry* entry) {
   }
 }
 
-// This is called after GC threads are done and nothing is accessing the old_entries
-// list, so no synchronization needed.
-void OopMapCache::cleanup_old_entries() {
-  OopMapCacheEntry* entry = _old_entries;
-  _old_entries = nullptr;
+bool OopMapCache::has_cleanup_work() {
+  return Atomic::load(&_old_entries) != nullptr;
+}
+
+void OopMapCache::trigger_cleanup() {
+  if (has_cleanup_work()) {
+    MutexLocker ml(Service_lock, Mutex::_no_safepoint_check_flag);
+    Service_lock->notify_all();
+  }
+}
+
+void OopMapCache::cleanup() {
+  OopMapCacheEntry* entry = Atomic::xchg(&_old_entries, (OopMapCacheEntry*)nullptr);
+  if (entry == nullptr) {
+    // No work.
+    return;
+  }
+
+  // About to delete the entries than might still be accessed by other threads
+  // on lookup path. Need to sync up with them before proceeding.
+  GlobalCounter::write_synchronize();
+
   while (entry != nullptr) {
     if (log_is_enabled(Debug, interpreter, oopmap)) {
       ResourceMark rm;
diff --git a/src/hotspot/share/interpreter/oopMapCache.hpp b/src/hotspot/share/interpreter/oopMapCache.hpp
index 7378a987cc6..3c124631377 100644
--- a/src/hotspot/share/interpreter/oopMapCache.hpp
+++ b/src/hotspot/share/interpreter/oopMapCache.hpp
@@ -179,7 +179,15 @@ class OopMapCache : public CHeapObj<mtClass> {
 
   // Compute an oop map without updating the cache or grabbing any locks (for debugging)
   static void compute_one_oop_map(const methodHandle& method, int bci, InterpreterOopMap* entry);
-  static void cleanup_old_entries();
+
+  // Check if we need to clean up old entries
+  static bool has_cleanup_work();
+
+  // Request cleanup if work is needed
+  static void trigger_cleanup();
+
+  // Clean up the old entries
+  static void cleanup();
 };
 
 #endif // SHARE_INTERPRETER_OOPMAPCACHE_HPP
diff --git a/src/hotspot/share/jfr/support/jfrIntrinsics.cpp b/src/hotspot/share/jfr/support/jfrIntrinsics.cpp
index 4b7c6c8aee9..63d0e686021 100644
--- a/src/hotspot/share/jfr/support/jfrIntrinsics.cpp
+++ b/src/hotspot/share/jfr/support/jfrIntrinsics.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,6 +74,7 @@ void* JfrIntrinsicSupport::write_checkpoint(JavaThread* jt) {
 
 void* JfrIntrinsicSupport::return_lease(JavaThread* jt) {
   DEBUG_ONLY(assert_precondition(jt);)
+  MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, jt));
   ThreadStateTransition::transition_from_java(jt, _thread_in_native);
   assert(jt->jfr_thread_local()->has_java_event_writer(), "invariant");
   assert(jt->jfr_thread_local()->shelved_buffer() != nullptr, "invariant");
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
index 99f427ee168..9dc0e381df9 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -102,7 +102,7 @@ class RetryableAllocationMark {
  private:
    InternalOOMEMark _iom;
  public:
-  RetryableAllocationMark(JavaThread* thread, bool activate) : _iom(activate ? thread : nullptr) {}
+  RetryableAllocationMark(JavaThread* thread) : _iom(thread) {}
   ~RetryableAllocationMark() {
     JavaThread* THREAD = _iom.thread(); // For exception macros.
     if (THREAD != nullptr) {
@@ -117,34 +117,29 @@ class RetryableAllocationMark {
   }
 };
 
-JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_instance_common(JavaThread* current, Klass* klass, bool null_on_fail))
+JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_instance_or_null(JavaThread* current, Klass* klass))
   JRT_BLOCK;
   assert(klass->is_klass(), "not a class");
   Handle holder(current, klass->klass_holder()); // keep the klass alive
   InstanceKlass* h = InstanceKlass::cast(klass);
   {
-    RetryableAllocationMark ram(current, null_on_fail);
+    RetryableAllocationMark ram(current);
     h->check_valid_for_instantiation(true, CHECK);
-    oop obj;
-    if (null_on_fail) {
-      if (!h->is_initialized()) {
-        // Cannot re-execute class initialization without side effects
-        // so return without attempting the initialization
-        return;
-      }
-    } else {
-      // make sure klass is initialized
-      h->initialize(CHECK);
+    if (!h->is_initialized()) {
+      // Cannot re-execute class initialization without side effects
+      // so return without attempting the initialization
+      current->set_vm_result(nullptr);
+      return;
     }
     // allocate instance and return via TLS
-    obj = h->allocate_instance(CHECK);
+    oop obj = h->allocate_instance(CHECK);
     current->set_vm_result(obj);
   }
   JRT_BLOCK_END;
   SharedRuntime::on_slowpath_allocation_exit(current);
 JRT_END
 
-JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_array_common(JavaThread* current, Klass* array_klass, jint length, bool null_on_fail))
+JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_array_or_null(JavaThread* current, Klass* array_klass, jint length))
   JRT_BLOCK;
   // Note: no handle for klass needed since they are not used
   //       anymore after new_objArray() and no GC can happen before.
@@ -153,27 +148,21 @@ JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_array_common(JavaThread* current, Klass*
   oop obj;
   if (array_klass->is_typeArray_klass()) {
     BasicType elt_type = TypeArrayKlass::cast(array_klass)->element_type();
-    RetryableAllocationMark ram(current, null_on_fail);
+    RetryableAllocationMark ram(current);
     obj = oopFactory::new_typeArray(elt_type, length, CHECK);
   } else {
     Handle holder(current, array_klass->klass_holder()); // keep the klass alive
     Klass* elem_klass = ObjArrayKlass::cast(array_klass)->element_klass();
-    RetryableAllocationMark ram(current, null_on_fail);
+    RetryableAllocationMark ram(current);
     obj = oopFactory::new_objArray(elem_klass, length, CHECK);
   }
   // This is pretty rare but this runtime patch is stressful to deoptimization
   // if we deoptimize here so force a deopt to stress the path.
   if (DeoptimizeALot) {
     static int deopts = 0;
-    // Alternate between deoptimizing and raising an error (which will also cause a deopt)
     if (deopts++ % 2 == 0) {
-      if (null_on_fail) {
-        // Drop the allocation
-        obj = nullptr;
-      } else {
-        ResourceMark rm(current);
-        THROW(vmSymbols::java_lang_OutOfMemoryError());
-      }
+      // Drop the allocation
+      obj = nullptr;
     } else {
       deopt_caller();
     }
@@ -183,42 +172,38 @@ JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_array_common(JavaThread* current, Klass*
   SharedRuntime::on_slowpath_allocation_exit(current);
 JRT_END
 
-JRT_ENTRY(void, JVMCIRuntime::new_multi_array_common(JavaThread* current, Klass* klass, int rank, jint* dims, bool null_on_fail))
+JRT_ENTRY(void, JVMCIRuntime::new_multi_array_or_null(JavaThread* current, Klass* klass, int rank, jint* dims))
   assert(klass->is_klass(), "not a class");
   assert(rank >= 1, "rank must be nonzero");
   Handle holder(current, klass->klass_holder()); // keep the klass alive
-  RetryableAllocationMark ram(current, null_on_fail);
+  RetryableAllocationMark ram(current);
   oop obj = ArrayKlass::cast(klass)->multi_allocate(rank, dims, CHECK);
   current->set_vm_result(obj);
 JRT_END
 
-JRT_ENTRY(void, JVMCIRuntime::dynamic_new_array_common(JavaThread* current, oopDesc* element_mirror, jint length, bool null_on_fail))
-  RetryableAllocationMark ram(current, null_on_fail);
+JRT_ENTRY(void, JVMCIRuntime::dynamic_new_array_or_null(JavaThread* current, oopDesc* element_mirror, jint length))
+  RetryableAllocationMark ram(current);
   oop obj = Reflection::reflect_new_array(element_mirror, length, CHECK);
   current->set_vm_result(obj);
 JRT_END
 
-JRT_ENTRY(void, JVMCIRuntime::dynamic_new_instance_common(JavaThread* current, oopDesc* type_mirror, bool null_on_fail))
+JRT_ENTRY(void, JVMCIRuntime::dynamic_new_instance_or_null(JavaThread* current, oopDesc* type_mirror))
   InstanceKlass* klass = InstanceKlass::cast(java_lang_Class::as_Klass(type_mirror));
 
   if (klass == nullptr) {
     ResourceMark rm(current);
     THROW(vmSymbols::java_lang_InstantiationException());
   }
-  RetryableAllocationMark ram(current, null_on_fail);
+  RetryableAllocationMark ram(current);
 
   // Create new instance (the receiver)
   klass->check_valid_for_instantiation(false, CHECK);
 
-  if (null_on_fail) {
-    if (!klass->is_initialized()) {
-      // Cannot re-execute class initialization without side effects
-      // so return without attempting the initialization
-      return;
-    }
-  } else {
-    // Make sure klass gets initialized
-    klass->initialize(CHECK);
+  if (!klass->is_initialized()) {
+    // Cannot re-execute class initialization without side effects
+    // so return without attempting the initialization
+    current->set_vm_result(nullptr);
+    return;
   }
 
   oop obj = klass->allocate_instance(CHECK);
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.hpp b/src/hotspot/share/jvmci/jvmciRuntime.hpp
index 6a920eb8c70..123cfde15ac 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.hpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.hpp
@@ -504,34 +504,16 @@ class JVMCIRuntime: public CHeapObj<mtJVMCI> {
 
   static BasicType kindToBasicType(const Handle& kind, TRAPS);
 
-  static void new_instance_common(JavaThread* current, Klass* klass, bool null_on_fail);
-  static void new_array_common(JavaThread* current, Klass* klass, jint length, bool null_on_fail);
-  static void new_multi_array_common(JavaThread* current, Klass* klass, int rank, jint* dims, bool null_on_fail);
-  static void dynamic_new_array_common(JavaThread* current, oopDesc* element_mirror, jint length, bool null_on_fail);
-  static void dynamic_new_instance_common(JavaThread* current, oopDesc* type_mirror, bool null_on_fail);
-
   // The following routines are called from compiled JVMCI code
 
-  // When allocation fails, these stubs:
-  // 1. Exercise -XX:+HeapDumpOnOutOfMemoryError and -XX:OnOutOfMemoryError handling and also
-  //    post a JVMTI_EVENT_RESOURCE_EXHAUSTED event if the failure is an OutOfMemroyError
-  // 2. Return null with a pending exception.
-  // Compiled code must ensure these stubs are not called twice for the same allocation
-  // site due to the non-repeatable side effects in the case of OOME.
-  static void new_instance(JavaThread* current, Klass* klass) { new_instance_common(current, klass, false); }
-  static void new_array(JavaThread* current, Klass* klass, jint length) { new_array_common(current, klass, length, false); }
-  static void new_multi_array(JavaThread* current, Klass* klass, int rank, jint* dims) { new_multi_array_common(current, klass, rank, dims, false); }
-  static void dynamic_new_array(JavaThread* current, oopDesc* element_mirror, jint length) { dynamic_new_array_common(current, element_mirror, length, false); }
-  static void dynamic_new_instance(JavaThread* current, oopDesc* type_mirror) { dynamic_new_instance_common(current, type_mirror, false); }
-
-  // When allocation fails, these stubs return null and have no pending exception. Compiled code
-  // can use these stubs if a failed allocation will be retried (e.g., by deoptimizing and
-  // re-executing in the interpreter).
-  static void new_instance_or_null(JavaThread* thread, Klass* klass) { new_instance_common(thread, klass, true); }
-  static void new_array_or_null(JavaThread* thread, Klass* klass, jint length) { new_array_common(thread, klass, length, true); }
-  static void new_multi_array_or_null(JavaThread* thread, Klass* klass, int rank, jint* dims) { new_multi_array_common(thread, klass, rank, dims, true); }
-  static void dynamic_new_array_or_null(JavaThread* thread, oopDesc* element_mirror, jint length) { dynamic_new_array_common(thread, element_mirror, length, true); }
-  static void dynamic_new_instance_or_null(JavaThread* thread, oopDesc* type_mirror) { dynamic_new_instance_common(thread, type_mirror, true); }
+  // When allocation fails, these stubs return null and have no pending OutOfMemoryError exception.
+  // Compiled code can use these stubs if a failed allocation will be retried (e.g., by deoptimizing
+  // and re-executing in the interpreter).
+  static void new_instance_or_null(JavaThread* thread, Klass* klass);
+  static void new_array_or_null(JavaThread* thread, Klass* klass, jint length);
+  static void new_multi_array_or_null(JavaThread* thread, Klass* klass, int rank, jint* dims);
+  static void dynamic_new_array_or_null(JavaThread* thread, oopDesc* element_mirror, jint length);
+  static void dynamic_new_instance_or_null(JavaThread* thread, oopDesc* type_mirror);
 
   static void vm_message(jboolean vmError, jlong format, jlong v1, jlong v2, jlong v3);
   static jint identity_hash_code(JavaThread* current, oopDesc* obj);
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index cadbba27f6e..c72ca3870b5 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -251,6 +251,8 @@
   nonstatic_field(Klass,                       _modifier_flags,                               jint)                                  \
   nonstatic_field(Klass,                       _access_flags,                                 AccessFlags)                           \
   nonstatic_field(Klass,                       _class_loader_data,                            ClassLoaderData*)                      \
+  nonstatic_field(Klass,                       _bitmap,                                       uintx)                                 \
+  nonstatic_field(Klass,                       _hash_slot,                                    uint8_t)                               \
                                                                                                                                      \
   nonstatic_field(LocalVariableTableElement,   start_bci,                                     u2)                                    \
   nonstatic_field(LocalVariableTableElement,   length,                                        u2)                                    \
@@ -359,6 +361,8 @@
   static_field(StubRoutines,                _md5_implCompressMB,                              address)                               \
   static_field(StubRoutines,                _chacha20Block,                                   address)                               \
   static_field(StubRoutines,                _poly1305_processBlocks,                          address)                               \
+  static_field(StubRoutines,                _intpoly_montgomeryMult_P256,                     address)                               \
+  static_field(StubRoutines,                _intpoly_assign,                                  address)                               \
   static_field(StubRoutines,                _sha1_implCompress,                               address)                               \
   static_field(StubRoutines,                _sha1_implCompressMB,                             address)                               \
   static_field(StubRoutines,                _sha256_implCompress,                             address)                               \
@@ -381,6 +385,7 @@
   static_field(StubRoutines,                _bigIntegerRightShiftWorker,                      address)                               \
   static_field(StubRoutines,                _bigIntegerLeftShiftWorker,                       address)                               \
   static_field(StubRoutines,                _cont_thaw,                                       address)                               \
+  static_field(StubRoutines,                _lookup_secondary_supers_table_slow_path_stub,    address)                               \
                                                                                                                                      \
   nonstatic_field(Thread,                   _tlab,                                            ThreadLocalAllocBuffer)                \
   nonstatic_field(Thread,                   _allocated_bytes,                                 jlong)                                 \
@@ -800,39 +805,33 @@
   declare_function(Deoptimization::uncommon_trap)                         \
   declare_function(Deoptimization::unpack_frames)                         \
                                                                           \
-  declare_function(JVMCIRuntime::new_instance) \
-  declare_function(JVMCIRuntime::new_array) \
-  declare_function(JVMCIRuntime::new_multi_array) \
-  declare_function(JVMCIRuntime::dynamic_new_array) \
-  declare_function(JVMCIRuntime::dynamic_new_instance) \
-  \
-  declare_function(JVMCIRuntime::new_instance_or_null) \
-  declare_function(JVMCIRuntime::new_array_or_null) \
-  declare_function(JVMCIRuntime::new_multi_array_or_null) \
-  declare_function(JVMCIRuntime::dynamic_new_array_or_null) \
-  declare_function(JVMCIRuntime::dynamic_new_instance_or_null) \
-  \
-  declare_function(JVMCIRuntime::invoke_static_method_one_arg) \
-  \
-  declare_function(JVMCIRuntime::vm_message) \
-  declare_function(JVMCIRuntime::identity_hash_code) \
-  declare_function(JVMCIRuntime::exception_handler_for_pc) \
-  declare_function(JVMCIRuntime::monitorenter) \
-  declare_function(JVMCIRuntime::monitorexit) \
-  declare_function(JVMCIRuntime::object_notify) \
-  declare_function(JVMCIRuntime::object_notifyAll) \
-  declare_function(JVMCIRuntime::throw_and_post_jvmti_exception) \
-  declare_function(JVMCIRuntime::throw_klass_external_name_exception) \
-  declare_function(JVMCIRuntime::throw_class_cast_exception) \
-  declare_function(JVMCIRuntime::log_primitive) \
-  declare_function(JVMCIRuntime::log_object) \
-  declare_function(JVMCIRuntime::log_printf) \
-  declare_function(JVMCIRuntime::vm_error) \
-  declare_function(JVMCIRuntime::load_and_clear_exception) \
-  G1GC_ONLY(declare_function(JVMCIRuntime::write_barrier_pre)) \
-  G1GC_ONLY(declare_function(JVMCIRuntime::write_barrier_post)) \
-  declare_function(JVMCIRuntime::validate_object) \
-  \
+  declare_function(JVMCIRuntime::new_instance_or_null)                    \
+  declare_function(JVMCIRuntime::new_array_or_null)                       \
+  declare_function(JVMCIRuntime::new_multi_array_or_null)                 \
+  declare_function(JVMCIRuntime::dynamic_new_array_or_null)               \
+  declare_function(JVMCIRuntime::dynamic_new_instance_or_null)            \
+                                                                          \
+  declare_function(JVMCIRuntime::invoke_static_method_one_arg)            \
+                                                                          \
+  declare_function(JVMCIRuntime::vm_message)                              \
+  declare_function(JVMCIRuntime::identity_hash_code)                      \
+  declare_function(JVMCIRuntime::exception_handler_for_pc)                \
+  declare_function(JVMCIRuntime::monitorenter)                            \
+  declare_function(JVMCIRuntime::monitorexit)                             \
+  declare_function(JVMCIRuntime::object_notify)                           \
+  declare_function(JVMCIRuntime::object_notifyAll)                        \
+  declare_function(JVMCIRuntime::throw_and_post_jvmti_exception)          \
+  declare_function(JVMCIRuntime::throw_klass_external_name_exception)     \
+  declare_function(JVMCIRuntime::throw_class_cast_exception)              \
+  declare_function(JVMCIRuntime::log_primitive)                           \
+  declare_function(JVMCIRuntime::log_object)                              \
+  declare_function(JVMCIRuntime::log_printf)                              \
+  declare_function(JVMCIRuntime::vm_error)                                \
+  declare_function(JVMCIRuntime::load_and_clear_exception)                \
+  G1GC_ONLY(declare_function(JVMCIRuntime::write_barrier_pre))            \
+  G1GC_ONLY(declare_function(JVMCIRuntime::write_barrier_post))           \
+  declare_function(JVMCIRuntime::validate_object)                         \
+                                                                          \
   declare_function(JVMCIRuntime::test_deoptimize_call_int)
 
 
diff --git a/src/hotspot/share/nmt/memBaseline.cpp b/src/hotspot/share/nmt/memBaseline.cpp
index 1e20bdfe9f6..1411bf7640e 100644
--- a/src/hotspot/share/nmt/memBaseline.cpp
+++ b/src/hotspot/share/nmt/memBaseline.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -151,11 +151,6 @@ bool MemBaseline::baseline_allocation_sites() {
     return false;
   }
 
-  // Walk simple thread stacks
-  if (!ThreadStackTracker::walk_simple_thread_stack_site(&malloc_walker)) {
-    return false;
-  }
-
   _malloc_sites.move(malloc_walker.malloc_sites());
   // The malloc sites are collected in size order
   _malloc_sites_order = by_size;
diff --git a/src/hotspot/share/nmt/memReporter.cpp b/src/hotspot/share/nmt/memReporter.cpp
index edb289c2f35..b880e56a853 100644
--- a/src/hotspot/share/nmt/memReporter.cpp
+++ b/src/hotspot/share/nmt/memReporter.cpp
@@ -193,17 +193,10 @@ void MemSummaryReporter::report_summary_of_type(MEMFLAGS flag,
 
   // Count thread's native stack in "Thread" category
   if (flag == mtThread) {
-    if (ThreadStackTracker::track_as_vm()) {
-      const VirtualMemory* thread_stack_usage =
-        (const VirtualMemory*)_vm_snapshot->by_type(mtThreadStack);
-      reserved_amount  += thread_stack_usage->reserved();
-      committed_amount += thread_stack_usage->committed();
-    } else {
-      const MallocMemory* thread_stack_usage =
-        (const MallocMemory*)_malloc_snapshot->by_type(mtThreadStack);
-      reserved_amount += thread_stack_usage->malloc_size();
-      committed_amount += thread_stack_usage->malloc_size();
-    }
+    const VirtualMemory* thread_stack_usage =
+      (const VirtualMemory*)_vm_snapshot->by_type(mtThreadStack);
+    reserved_amount  += thread_stack_usage->reserved();
+    committed_amount += thread_stack_usage->committed();
   } else if (flag == mtNMT) {
     // Count malloc headers in "NMT" category
     reserved_amount  += _malloc_snapshot->malloc_overhead();
@@ -240,21 +233,12 @@ void MemSummaryReporter::report_summary_of_type(MEMFLAGS flag,
     out->print_cr("%27s (  instance classes #" SIZE_FORMAT ", array classes #" SIZE_FORMAT ")",
       " ", _instance_class_count, _array_class_count);
   } else if (flag == mtThread) {
-    if (ThreadStackTracker::track_as_vm()) {
-      const VirtualMemory* thread_stack_usage =
-       _vm_snapshot->by_type(mtThreadStack);
-      // report thread count
-      out->print_cr("%27s (threads #" SIZE_FORMAT ")", " ", ThreadStackTracker::thread_count());
-      out->print("%27s (stack: ", " ");
-      print_total(thread_stack_usage->reserved(), thread_stack_usage->committed(), thread_stack_usage->peak_size());
-    } else {
-      MallocMemory* thread_stack_memory = _malloc_snapshot->by_type(mtThreadStack);
-      const char* scale = current_scale();
-      // report thread count
-      out->print_cr("%27s (threads #" SIZE_FORMAT ")", " ", thread_stack_memory->malloc_count());
-      out->print("%27s (Stack: " SIZE_FORMAT "%s", " ",
-        amount_in_current_scale(thread_stack_memory->malloc_size()), scale);
-    }
+    const VirtualMemory* thread_stack_usage =
+     _vm_snapshot->by_type(mtThreadStack);
+    // report thread count
+    out->print_cr("%27s (threads #" SIZE_FORMAT ")", " ", ThreadStackTracker::thread_count());
+    out->print("%27s (stack: ", " ");
+    print_total(thread_stack_usage->reserved(), thread_stack_usage->committed(), thread_stack_usage->peak_size());
     out->print_cr(")");
   }
 
@@ -627,24 +611,15 @@ void MemSummaryDiffReporter::diff_summary_of_type(MEMFLAGS flag,
       out->print_cr(")");
 
       out->print("%27s (stack: ", " ");
-      if (ThreadStackTracker::track_as_vm()) {
-        // report thread stack
-        const VirtualMemory* current_thread_stack =
-          _current_baseline.virtual_memory(mtThreadStack);
-        const VirtualMemory* early_thread_stack =
-          _early_baseline.virtual_memory(mtThreadStack);
-
-        print_virtual_memory_diff(current_thread_stack->reserved(), current_thread_stack->committed(),
-          early_thread_stack->reserved(), early_thread_stack->committed());
-      } else {
-        const MallocMemory* current_thread_stack =
-          _current_baseline.malloc_memory(mtThreadStack);
-        const MallocMemory* early_thread_stack =
-          _early_baseline.malloc_memory(mtThreadStack);
+      // report thread stack
+      const VirtualMemory* current_thread_stack =
+        _current_baseline.virtual_memory(mtThreadStack);
+      const VirtualMemory* early_thread_stack =
+        _early_baseline.virtual_memory(mtThreadStack);
+
+      print_virtual_memory_diff(current_thread_stack->reserved(), current_thread_stack->committed(),
+        early_thread_stack->reserved(), early_thread_stack->committed());
 
-        print_malloc_diff(current_thread_stack->malloc_size(), current_thread_stack->malloc_count(),
-          early_thread_stack->malloc_size(), early_thread_stack->malloc_count(), flag);
-      }
       out->print_cr(")");
     }
 
diff --git a/src/hotspot/share/nmt/memTracker.cpp b/src/hotspot/share/nmt/memTracker.cpp
index 5504f436b7d..955bd816737 100644
--- a/src/hotspot/share/nmt/memTracker.cpp
+++ b/src/hotspot/share/nmt/memTracker.cpp
@@ -67,8 +67,7 @@ void MemTracker::initialize() {
 
   if (level > NMT_off) {
     if (!MallocTracker::initialize(level) ||
-        !VirtualMemoryTracker::initialize(level) ||
-        !ThreadStackTracker::initialize(level)) {
+        !VirtualMemoryTracker::initialize(level)) {
       assert(false, "NMT initialization failed");
       level = NMT_off;
       log_warning(nmt)("NMT initialization failed. NMT disabled.");
diff --git a/src/hotspot/share/nmt/nmtUsage.cpp b/src/hotspot/share/nmt/nmtUsage.cpp
index a00b3cdc90d..62c41225441 100644
--- a/src/hotspot/share/nmt/nmtUsage.cpp
+++ b/src/hotspot/share/nmt/nmtUsage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,13 +43,11 @@ NMTUsage::NMTUsage(NMTUsageOptions options) :
     _usage_options(options) { }
 
 void NMTUsage::walk_thread_stacks() {
-  // If backed by virtual memory, snapping the thread stacks involves walking
-  // them to to figure out how much memory is committed if they are backed by
-  // virtual memory. This needs ot happen before we take the snapshot of the
-  // virtual memory since it will update this information.
-  if (ThreadStackTracker::track_as_vm()) {
-    VirtualMemoryTracker::snapshot_thread_stacks();
-  }
+  // Snapping the thread stacks involves walking the areas to figure out how
+  // much memory had been committed if they are backed by virtual memory. This
+  // needs to happen before we take the snapshot of the virtual memory since it
+  // will update this information.
+  VirtualMemoryTracker::snapshot_thread_stacks();
 }
 
 void NMTUsage::update_malloc_usage() {
diff --git a/src/hotspot/share/nmt/threadStackTracker.cpp b/src/hotspot/share/nmt/threadStackTracker.cpp
index 6060b636153..6f112fa8fc5 100644
--- a/src/hotspot/share/nmt/threadStackTracker.cpp
+++ b/src/hotspot/share/nmt/threadStackTracker.cpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2019, 2021, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2019, 2024, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,95 +25,46 @@
 
 #include "precompiled.hpp"
 
-#include "nmt/mallocTracker.hpp"
 #include "nmt/memTracker.hpp"
 #include "nmt/threadStackTracker.hpp"
 #include "nmt/virtualMemoryTracker.hpp"
+#include "runtime/os.hpp"
 #include "runtime/threadCritical.hpp"
+#include "utilities/align.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 volatile size_t ThreadStackTracker::_thread_count = 0;
-SortedLinkedList<SimpleThreadStackSite, ThreadStackTracker::compare_thread_stack_base>* ThreadStackTracker::_simple_thread_stacks = nullptr;
 
-bool ThreadStackTracker::initialize(NMT_TrackingLevel level) {
-  if (level == NMT_detail && !track_as_vm()) {
-    _simple_thread_stacks = new (std::nothrow, mtNMT)
-      SortedLinkedList<SimpleThreadStackSite, ThreadStackTracker::compare_thread_stack_base>();
-    return (_simple_thread_stacks != nullptr);
-  }
-  return true;
-}
-
-int ThreadStackTracker::compare_thread_stack_base(const SimpleThreadStackSite& s1, const SimpleThreadStackSite& s2) {
-  return primitive_compare(s1.base(), s2.base());
+static void align_thread_stack_boundaries_inward(void*& base, size_t& size) {
+  // Thread stack boundaries don't have to be aligned to page boundaries. For cases where they
+  // are not aligned (e.g. AIX, Alpine), this function corrects boundaries inward to the next
+  // page boundaries. This ensures that we can track thread stacks piggybacking on the virtual
+  // memory tracker.
+  void* const base_aligned = align_up(base, os::vm_page_size());
+  const size_t size_aligned = align_down(size, os::vm_page_size());
+  assert(size_aligned > 0, "stack size less than a page?");
+  base = base_aligned;
+  size = size_aligned;
 }
 
 void ThreadStackTracker::new_thread_stack(void* base, size_t size, const NativeCallStack& stack) {
-  assert(MemTracker::tracking_level() >= NMT_summary, "Must be");
+  assert(MemTracker::enabled(), "Must be");
   assert(base != nullptr, "Should have been filtered");
+  align_thread_stack_boundaries_inward(base, size);
+
   ThreadCritical tc;
-  if (track_as_vm()) {
-    VirtualMemoryTracker::add_reserved_region((address)base, size, stack, mtThreadStack);
-  } else {
-    // Use a slot in mallocMemorySummary for thread stack bookkeeping
-    MallocMemorySummary::record_malloc(size, mtThreadStack);
-    if (MemTracker::tracking_level() == NMT_detail) {
-      assert(_simple_thread_stacks != nullptr, "Must be initialized");
-      SimpleThreadStackSite site((address)base, size, stack);
-      _simple_thread_stacks->add(site);
-    }
-  }
+  VirtualMemoryTracker::add_reserved_region((address)base, size, stack, mtThreadStack);
   _thread_count++;
 }
 
 void ThreadStackTracker::delete_thread_stack(void* base, size_t size) {
-  assert(MemTracker::tracking_level() >= NMT_summary, "Must be");
+  assert(MemTracker::enabled(), "Must be");
   assert(base != nullptr, "Should have been filtered");
+  align_thread_stack_boundaries_inward(base, size);
+
   ThreadCritical tc;
-  if(track_as_vm()) {
-    VirtualMemoryTracker::remove_released_region((address)base, size);
-  } else {
-    // Use a slot in mallocMemorySummary for thread stack bookkeeping
-    MallocMemorySummary::record_free(size, mtThreadStack);
-    if (MemTracker::tracking_level() == NMT_detail) {
-      assert(_simple_thread_stacks != nullptr, "Must be initialized");
-      SimpleThreadStackSite site((address)base, size, NativeCallStack::empty_stack()); // Fake object just to serve as compare target for delete
-      bool removed = _simple_thread_stacks->remove(site);
-      assert(removed, "Must exist");
-    }
-  }
+  VirtualMemoryTracker::remove_released_region((address)base, size);
   _thread_count--;
 }
 
-bool ThreadStackTracker::walk_simple_thread_stack_site(MallocSiteWalker* walker) {
-  if (!track_as_vm()) {
-    LinkedListImpl<MallocSite> _sites;
-    {
-      ThreadCritical tc;
-      assert(_simple_thread_stacks != nullptr, "Must be initialized");
-      LinkedListIterator<SimpleThreadStackSite> itr(_simple_thread_stacks->head());
-      const SimpleThreadStackSite* ts = itr.next();
-      // Consolidate sites and convert to MallocSites, so we can piggyback into
-      // malloc snapshot
-      while (ts != nullptr) {
-        MallocSite site(*ts->call_stack(), mtThreadStack);
-        MallocSite* exist = _sites.find(site);
-        if (exist != nullptr) {
-          exist->allocate(ts->size());
-        } else {
-          site.allocate(ts->size());
-          _sites.add(site);
-        }
-        ts = itr.next();
-      }
-    }
-
-    // Piggyback to malloc snapshot
-    LinkedListIterator<MallocSite> site_itr(_sites.head());
-    const MallocSite* s = site_itr.next();
-    while (s != nullptr) {
-      walker->do_malloc_site(s);
-      s = site_itr.next();
-    }
-  }
-  return true;
-}
diff --git a/src/hotspot/share/nmt/threadStackTracker.hpp b/src/hotspot/share/nmt/threadStackTracker.hpp
index 6e2ec361954..0be7f528264 100644
--- a/src/hotspot/share/nmt/threadStackTracker.hpp
+++ b/src/hotspot/share/nmt/threadStackTracker.hpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2019, 2021, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2019, 2024, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,61 +26,17 @@
 #ifndef SHARE_NMT_THREADSTACKTRACKER_HPP
 #define SHARE_NMT_THREADSTACKTRACKER_HPP
 
-#include "nmt/allocationSite.hpp"
-#include "nmt/mallocSiteTable.hpp"
-#include "nmt/nmtCommon.hpp"
-#include "utilities/linkedlist.hpp"
+#include "memory/allStatic.hpp"
+#include "utilities/globalDefinitions.hpp"
 #include "utilities/nativeCallStack.hpp"
 
-class SimpleThreadStackSite : public AllocationSite {
-  const address _base;
-  const size_t  _size;
-public:
-  SimpleThreadStackSite(address base, size_t size, const NativeCallStack& stack) :
-    AllocationSite(stack, mtThreadStack),
-    _base(base),
-    _size(size) {}
-
-  bool equals(const SimpleThreadStackSite& mts) const {
-    bool eq = base() == mts.base();
-    assert(!eq || size() == mts.size(), "Must match");
-    return eq;
-  }
-
-  size_t  size() const { return _size; }
-  address base() const { return _base; }
-};
-
-  /*
-   * Most of platforms, that hotspot support, have their thread stacks backed by
-   * virtual memory by default. For these cases, thread stack tracker simply
-   * delegates tracking to virtual memory tracker.
-   * However, there are exceptions, (e.g. AIX), that platforms can provide stacks
-   * that are not page aligned. A hypothetical VM implementation, it can provide
-   * it own stacks. In these case, track_as_vm() should return false and manage
-   * stack tracking by this tracker internally.
-   * During memory snapshot, tracked thread stacks memory data is walked and stored
-   * along with malloc'd data inside baseline. The regions are not scanned and assumed
-   * all committed for now. Can add scanning phase when there is a need.
-   */
 class ThreadStackTracker : AllStatic {
 private:
   static volatile size_t _thread_count;
-
-  static int compare_thread_stack_base(const SimpleThreadStackSite& s1, const SimpleThreadStackSite& s2);
-  static SortedLinkedList<SimpleThreadStackSite, compare_thread_stack_base>* _simple_thread_stacks;
 public:
-  static bool initialize(NMT_TrackingLevel level);
-
   static void new_thread_stack(void* base, size_t size, const NativeCallStack& stack);
   static void delete_thread_stack(void* base, size_t size);
-
-  static bool   track_as_vm()  { return AIX_ONLY(false) NOT_AIX(true); }
   static size_t thread_count() { return _thread_count; }
-
-  // Snapshot support. Piggyback thread stack data in malloc slot, NMT always handles
-  // thread stack slot specially since beginning.
-  static bool walk_simple_thread_stack_site(MallocSiteWalker* walker);
 };
 
 #endif // SHARE_NMT_THREADSTACKTRACKER_HPP
diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.cpp b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
index 06f9469f25e..46d7e4b644f 100644
--- a/src/hotspot/share/nmt/virtualMemoryTracker.cpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,11 +47,8 @@ void VirtualMemory::update_peak(size_t size) {
 }
 
 void VirtualMemorySummary::snapshot(VirtualMemorySnapshot* s) {
-  // Only if thread stack is backed by virtual memory
-  if (ThreadStackTracker::track_as_vm()) {
-    // Snapshot current thread stacks
-    VirtualMemoryTracker::snapshot_thread_stacks();
-  }
+  // Snapshot current thread stacks
+  VirtualMemoryTracker::snapshot_thread_stacks();
   as_snapshot()->copy_to(s);
 }
 
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index 929c8b87d39..4be0cf78bdc 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -310,16 +310,13 @@ int Method::fast_exception_handler_bci_for(const methodHandle& mh, Klass* ex_kla
 
 void Method::mask_for(int bci, InterpreterOopMap* mask) {
   methodHandle h_this(Thread::current(), this);
-  // Only GC uses the OopMapCache during thread stack root scanning
-  // any other uses generate an oopmap but do not save it in the cache.
-  if (Universe::heap()->is_stw_gc_active()) {
-    method_holder()->mask_for(h_this, bci, mask);
-  } else {
-    OopMapCache::compute_one_oop_map(h_this, bci, mask);
-  }
-  return;
+  mask_for(h_this, bci, mask);
 }
 
+void Method::mask_for(const methodHandle& this_mh, int bci, InterpreterOopMap* mask) {
+  assert(this_mh() == this, "Sanity");
+  method_holder()->mask_for(this_mh, bci, mask);
+}
 
 int Method::bci_from(address bcp) const {
   if (is_native() && bcp == 0) {
diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp
index b5634c8a099..905c53a4ea3 100644
--- a/src/hotspot/share/oops/method.hpp
+++ b/src/hotspot/share/oops/method.hpp
@@ -446,8 +446,10 @@ class Method : public Metadata {
   address signature_handler() const              { return *(signature_handler_addr()); }
   void set_signature_handler(address handler);
 
-  // Interpreter oopmap support
+  // Interpreter oopmap support.
+  // If handle is already available, call with it for better performance.
   void mask_for(int bci, InterpreterOopMap* mask);
+  void mask_for(const methodHandle& this_mh, int bci, InterpreterOopMap* mask);
 
   // operations on invocation counter
   void print_invocation_count(outputStream* st);
@@ -811,14 +813,6 @@ class Method : public Metadata {
     return _method_counters;
   }
 
-  // Clear the flags related to compiler directives that were set by the compilerBroker,
-  // because the directives can be updated.
-  void clear_directive_flags() {
-    set_has_matching_directives(false);
-    clear_is_not_c1_compilable();
-    clear_is_not_c2_compilable();
-  }
-
   void clear_is_not_c1_compilable()           { set_is_not_c1_compilable(false); }
   void clear_is_not_c2_compilable()           { set_is_not_c2_compilable(false); }
   void clear_is_not_c2_osr_compilable()       { set_is_not_c2_osr_compilable(false); }
diff --git a/src/hotspot/share/oops/methodFlags.hpp b/src/hotspot/share/oops/methodFlags.hpp
index 0a5ce56599a..25d597b06ef 100644
--- a/src/hotspot/share/oops/methodFlags.hpp
+++ b/src/hotspot/share/oops/methodFlags.hpp
@@ -58,7 +58,6 @@ class MethodFlags {
    status(has_loops_flag              , 1 << 13) /* Method has loops */ \
    status(has_loops_flag_init         , 1 << 14) /* The loop flag has been initialized */ \
    status(on_stack_flag               , 1 << 15) /* RedefineClasses support to keep Metadata from being cleaned */ \
-   status(has_matching_directives     , 1 << 16) /* Temporary mark, used only when methods are to be refreshed to reflect a compiler directives update */ \
    /* end of list */
 
 #define M_STATUS_ENUM_NAME(name, value)    _misc_##name = value,
diff --git a/src/hotspot/share/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp
index dc15e82dff8..c5e17478477 100644
--- a/src/hotspot/share/opto/c2compiler.cpp
+++ b/src/hotspot/share/opto/c2compiler.cpp
@@ -786,6 +786,8 @@ bool C2Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
   case vmIntrinsics::_base64_encodeBlock:
   case vmIntrinsics::_base64_decodeBlock:
   case vmIntrinsics::_poly1305_processBlocks:
+  case vmIntrinsics::_intpoly_montgomeryMult_P256:
+  case vmIntrinsics::_intpoly_assign:
   case vmIntrinsics::_updateCRC32:
   case vmIntrinsics::_updateBytesCRC32:
   case vmIntrinsics::_updateByteBufferCRC32:
diff --git a/src/hotspot/share/opto/castnode.cpp b/src/hotspot/share/opto/castnode.cpp
index a93c9b382f9..1771107c851 100644
--- a/src/hotspot/share/opto/castnode.cpp
+++ b/src/hotspot/share/opto/castnode.cpp
@@ -213,13 +213,7 @@ const Type* CastIINode::Value(PhaseGVN* phase) const {
 
   // Similar to ConvI2LNode::Value() for the same reasons
   // see if we can remove type assertion after loop opts
-  // But here we have to pay extra attention:
-  // Do not narrow the type of range check dependent CastIINodes to
-  // avoid corruption of the graph if a CastII is replaced by TOP but
-  // the corresponding range check is not removed.
-  if (!_range_check_dependency) {
-    res = widen_type(phase, res, T_INT);
-  }
+  res = widen_type(phase, res, T_INT);
 
   return res;
 }
@@ -239,11 +233,11 @@ Node *CastIINode::Ideal(PhaseGVN *phase, bool can_reshape) {
   if (progress != nullptr) {
     return progress;
   }
-  if (can_reshape && !_range_check_dependency && !phase->C->post_loop_opts_phase()) {
+  if (can_reshape && !phase->C->post_loop_opts_phase()) {
     // makes sure we run ::Value to potentially remove type assertion after loop opts
     phase->C->record_for_post_loop_opts_igvn(this);
   }
-  if (!_range_check_dependency) {
+  if (!_type->is_int()->empty()) {
     return optimize_integer_cast(phase, T_INT);
   }
   return nullptr;
@@ -254,13 +248,6 @@ Node* CastIINode::Identity(PhaseGVN* phase) {
   if (progress != this) {
     return progress;
   }
-  if (_range_check_dependency) {
-    if (phase->C->post_loop_opts_phase()) {
-      return this->in(1);
-    } else {
-      phase->C->record_for_post_loop_opts_igvn(this);
-    }
-  }
   return this;
 }
 
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 25c7ced8aeb..445f22c6b80 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -3464,6 +3464,10 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
     }
     break;
   }
+  case Op_CastII: {
+    remove_range_check_cast(n->as_CastII());
+  }
+  break;
 #ifdef _LP64
   case Op_CmpP:
     // Do this transformation here to preserve CmpPNode::sub() and
@@ -3615,16 +3619,6 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
 
 #endif
 
-#ifdef ASSERT
-  case Op_CastII:
-    // Verify that all range check dependent CastII nodes were removed.
-    if (n->isa_CastII()->has_range_check()) {
-      n->dump(3);
-      assert(false, "Range check dependent CastII node was not removed");
-    }
-    break;
-#endif
-
   case Op_ModI:
     if (UseDivMod) {
       // Check if a%b and a/b both exist
@@ -3633,6 +3627,8 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
         // Replace them with a fused divmod if supported
         if (Matcher::has_match_rule(Op_DivModI)) {
           DivModINode* divmod = DivModINode::make(n);
+          divmod->add_prec_from(n);
+          divmod->add_prec_from(d);
           d->subsume_by(divmod->div_proj(), this);
           n->subsume_by(divmod->mod_proj(), this);
         } else {
@@ -3653,6 +3649,8 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
         // Replace them with a fused divmod if supported
         if (Matcher::has_match_rule(Op_DivModL)) {
           DivModLNode* divmod = DivModLNode::make(n);
+          divmod->add_prec_from(n);
+          divmod->add_prec_from(d);
           d->subsume_by(divmod->div_proj(), this);
           n->subsume_by(divmod->mod_proj(), this);
         } else {
@@ -3673,6 +3671,8 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
         // Replace them with a fused unsigned divmod if supported
         if (Matcher::has_match_rule(Op_UDivModI)) {
           UDivModINode* divmod = UDivModINode::make(n);
+          divmod->add_prec_from(n);
+          divmod->add_prec_from(d);
           d->subsume_by(divmod->div_proj(), this);
           n->subsume_by(divmod->mod_proj(), this);
         } else {
@@ -3693,6 +3693,8 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
         // Replace them with a fused unsigned divmod if supported
         if (Matcher::has_match_rule(Op_UDivModL)) {
           UDivModLNode* divmod = UDivModLNode::make(n);
+          divmod->add_prec_from(n);
+          divmod->add_prec_from(d);
           d->subsume_by(divmod->div_proj(), this);
           n->subsume_by(divmod->mod_proj(), this);
         } else {
@@ -3894,6 +3896,34 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
   }
 }
 
+void Compile::remove_range_check_cast(CastIINode* cast) {
+  if (cast->has_range_check()) {
+    // Range check CastII nodes feed into an address computation subgraph. Remove them to let that subgraph float freely.
+    // For memory access or integer divisions nodes that depend on the cast, record the dependency on the cast's control
+    // as a precedence edge, so they can't float above the cast in case that cast's narrowed type helped eliminate a
+    // range check or a null divisor check.
+    assert(cast->in(0) != nullptr, "All RangeCheck CastII must have a control dependency");
+    ResourceMark rm;
+    Unique_Node_List wq;
+    wq.push(cast);
+    for (uint next = 0; next < wq.size(); ++next) {
+      Node* m = wq.at(next);
+      for (DUIterator_Fast imax, i = m->fast_outs(imax); i < imax; i++) {
+        Node* use = m->fast_out(i);
+        if (use->is_Mem() || use->is_div_or_mod(T_INT) || use->is_div_or_mod(T_LONG)) {
+          use->ensure_control_or_add_prec(cast->in(0));
+        } else if (!use->is_CFG() && !use->is_Phi()) {
+          wq.push(use);
+        }
+      }
+    }
+    cast->subsume_by(cast->in(1), this);
+    if (cast->outcnt() == 0) {
+      cast->disconnect_inputs(this);
+    }
+  }
+}
+
 //------------------------------final_graph_reshaping_walk---------------------
 // Replacing Opaque nodes with their input in final_graph_reshaping_impl(),
 // requires that the walk visits a node's inputs before visiting the node.
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index e1d9b61f7f8..9a873b8b9cb 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -53,6 +53,7 @@ class Block;
 class Bundle;
 class CallGenerator;
 class CallStaticJavaNode;
+class CastIINode;
 class CloneMap;
 class CompilationFailureInfo;
 class ConnectionGraph;
@@ -1314,6 +1315,8 @@ class Compile : public Phase {
                             BasicType out_bt, BasicType in_bt);
 
   static Node* narrow_value(BasicType bt, Node* value, const Type* type, PhaseGVN* phase, bool transform_res);
+
+  void remove_range_check_cast(CastIINode* cast);
 };
 
 #endif // SHARE_OPTO_COMPILE_HPP
diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index 4b328806122..b011c9928b6 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -730,9 +730,22 @@ Node* ConnectionGraph::specialize_castpp(Node* castpp, Node* base, Node* current
 
 Node* ConnectionGraph::split_castpp_load_through_phi(Node* curr_addp, Node* curr_load, Node* region, GrowableArray<Node*>* bases_for_loads, GrowableArray<Node *>  &alloc_worklist) {
   const Type* load_type = _igvn->type(curr_load);
-  Node* nsr_value       = _igvn->zerocon(load_type->basic_type());
-  Node* data_phi        = _igvn->transform(PhiNode::make(region, nsr_value, load_type));
-  Node* memory          = curr_load->in(MemNode::Memory);
+  Node* nsr_value = _igvn->zerocon(load_type->basic_type());
+  Node* memory = curr_load->in(MemNode::Memory);
+
+  // The data_phi merging the loads needs to be nullable if
+  // we are loading pointers.
+  if (load_type->make_ptr() != nullptr) {
+    if (load_type->isa_narrowoop()) {
+      load_type = load_type->meet(TypeNarrowOop::NULL_PTR);
+    } else if (load_type->isa_ptr()) {
+      load_type = load_type->meet(TypePtr::NULL_PTR);
+    } else {
+      assert(false, "Unexpected load ptr type.");
+    }
+  }
+
+  Node* data_phi = PhiNode::make(region, nsr_value, load_type);
 
   for (int i = 1; i < bases_for_loads->length(); i++) {
     Node* base = bases_for_loads->at(i);
@@ -746,28 +759,28 @@ Node* ConnectionGraph::split_castpp_load_through_phi(Node* curr_addp, Node* curr
 
       Node* addr = _igvn->transform(new AddPNode(base, base, curr_addp->in(AddPNode::Offset)));
       Node* mem = (memory->is_Phi() && (memory->in(0) == region)) ? memory->in(i) : memory;
-      Node* load = _igvn->transform(curr_load->clone());
+      Node* load = curr_load->clone();
       load->set_req(0, nullptr);
       load->set_req(1, mem);
       load->set_req(2, addr);
 
       if (cmp_region != nullptr) { // see comment on previous if
-        Node* intermediate_phi = _igvn->transform(PhiNode::make(cmp_region, nsr_value, load_type));
-        intermediate_phi->set_req(1, load);
+        Node* intermediate_phi = PhiNode::make(cmp_region, nsr_value, load_type);
+        intermediate_phi->set_req(1, _igvn->transform(load));
         load = intermediate_phi;
       }
 
-      data_phi->set_req(i, load);
+      data_phi->set_req(i, _igvn->transform(load));
     } else {
       // Just use the default, which is already in phi
     }
   }
 
-  // Takes care of updating CG and split_unique_types worklists due to cloned
-  // AddP->Load.
+  // Takes care of updating CG and split_unique_types worklists due
+  // to cloned AddP->Load.
   updates_after_load_split(data_phi, curr_load, alloc_worklist);
 
-  return data_phi;
+  return _igvn->transform(data_phi);
 }
 
 // This method only reduces CastPP fields loads; SafePoints are handled
@@ -2160,6 +2173,8 @@ void ConnectionGraph::process_call_arguments(CallNode *call) {
                   strcmp(call->as_CallLeaf()->_name, "counterMode_AESCrypt") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "galoisCounterMode_AESCrypt") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "poly1305_processBlocks") == 0 ||
+                  strcmp(call->as_CallLeaf()->_name, "intpoly_montgomeryMult_P256") == 0 ||
+                  strcmp(call->as_CallLeaf()->_name, "intpoly_assign") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "ghash_processBlocks") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "chacha20Block") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "encodeBlock") == 0 ||
diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
index 794403611e5..bcf4ee40424 100644
--- a/src/hotspot/share/opto/graphKit.cpp
+++ b/src/hotspot/share/opto/graphKit.cpp
@@ -1468,6 +1468,9 @@ Node* GraphKit::must_be_not_null(Node* value, bool do_replace_in_map) {
   Node* opaq = _gvn.transform(new Opaque4Node(C, tst, intcon(1)));
   IfNode *iff = new IfNode(control(), opaq, PROB_MAX, COUNT_UNKNOWN);
   _gvn.set_type(iff, iff->Value(&_gvn));
+  if (!tst->is_Con()) {
+    record_for_igvn(iff);
+  }
   Node *if_f = _gvn.transform(new IfFalseNode(iff));
   Node *frame = _gvn.transform(new ParmNode(C->start(), TypeFunc::FramePtr));
   Node* halt = _gvn.transform(new HaltNode(if_f, frame, "unexpected null in intrinsic"));
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index b018fcf5097..96e88c1a96b 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -638,7 +638,10 @@ bool LibraryCallKit::try_to_inline(int predicate) {
     return inline_base64_decodeBlock();
   case vmIntrinsics::_poly1305_processBlocks:
     return inline_poly1305_processBlocks();
-
+  case vmIntrinsics::_intpoly_montgomeryMult_P256:
+    return inline_intpoly_montgomeryMult_P256();
+  case vmIntrinsics::_intpoly_assign:
+    return inline_intpoly_assign();
   case vmIntrinsics::_encodeISOArray:
   case vmIntrinsics::_encodeByteISOArray:
     return inline_encodeISOArray(false);
@@ -7568,6 +7571,69 @@ bool LibraryCallKit::inline_poly1305_processBlocks() {
   return true;
 }
 
+bool LibraryCallKit::inline_intpoly_montgomeryMult_P256() {
+  address stubAddr;
+  const char *stubName;
+  assert(UseIntPolyIntrinsics, "need intpoly intrinsics support");
+  assert(callee()->signature()->size() == 3, "intpoly_montgomeryMult_P256 has %d parameters", callee()->signature()->size());
+  stubAddr = StubRoutines::intpoly_montgomeryMult_P256();
+  stubName = "intpoly_montgomeryMult_P256";
+
+  if (!stubAddr) return false;
+  null_check_receiver();  // null-check receiver
+  if (stopped())  return true;
+
+  Node* a = argument(1);
+  Node* b = argument(2);
+  Node* r = argument(3);
+
+  a = must_be_not_null(a, true);
+  b = must_be_not_null(b, true);
+  r = must_be_not_null(r, true);
+
+  Node* a_start = array_element_address(a, intcon(0), T_LONG);
+  assert(a_start, "a array is NULL");
+  Node* b_start = array_element_address(b, intcon(0), T_LONG);
+  assert(b_start, "b array is NULL");
+  Node* r_start = array_element_address(r, intcon(0), T_LONG);
+  assert(r_start, "r array is NULL");
+
+  Node* call = make_runtime_call(RC_LEAF | RC_NO_FP,
+                                 OptoRuntime::intpoly_montgomeryMult_P256_Type(),
+                                 stubAddr, stubName, TypePtr::BOTTOM,
+                                 a_start, b_start, r_start);
+  Node* result = _gvn.transform(new ProjNode(call, TypeFunc::Parms));
+  set_result(result);
+  return true;
+}
+
+bool LibraryCallKit::inline_intpoly_assign() {
+  assert(UseIntPolyIntrinsics, "need intpoly intrinsics support");
+  assert(callee()->signature()->size() == 3, "intpoly_assign has %d parameters", callee()->signature()->size());
+  const char *stubName = "intpoly_assign";
+  address stubAddr = StubRoutines::intpoly_assign();
+  if (!stubAddr) return false;
+
+  Node* set = argument(0);
+  Node* a = argument(1);
+  Node* b = argument(2);
+  Node* arr_length = load_array_length(a);
+
+  a = must_be_not_null(a, true);
+  b = must_be_not_null(b, true);
+
+  Node* a_start = array_element_address(a, intcon(0), T_LONG);
+  assert(a_start, "a array is NULL");
+  Node* b_start = array_element_address(b, intcon(0), T_LONG);
+  assert(b_start, "b array is NULL");
+
+  Node* call = make_runtime_call(RC_LEAF | RC_NO_FP,
+                                 OptoRuntime::intpoly_assign_Type(),
+                                 stubAddr, stubName, TypePtr::BOTTOM,
+                                 set, a_start, b_start, arr_length);
+  return true;
+}
+
 //------------------------------inline_digestBase_implCompress-----------------------
 //
 // Calculate MD5 for single-block byte[] array.
diff --git a/src/hotspot/share/opto/library_call.hpp b/src/hotspot/share/opto/library_call.hpp
index cb4f34a0db6..1111c795114 100644
--- a/src/hotspot/share/opto/library_call.hpp
+++ b/src/hotspot/share/opto/library_call.hpp
@@ -307,6 +307,8 @@ class LibraryCallKit : public GraphKit {
   bool inline_base64_encodeBlock();
   bool inline_base64_decodeBlock();
   bool inline_poly1305_processBlocks();
+  bool inline_intpoly_montgomeryMult_P256();
+  bool inline_intpoly_assign();
   bool inline_digestBase_implCompress(vmIntrinsics::ID id);
   bool inline_digestBase_implCompressMB(int predicate);
   bool inline_digestBase_implCompressMB(Node* digestBaseObj, ciInstanceKlass* instklass,
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index e7cd56d57ea..25000f10000 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -49,8 +49,9 @@
 //------------------------------split_thru_phi---------------------------------
 // Split Node 'n' through merge point if there is enough win.
 Node* PhaseIdealLoop::split_thru_phi(Node* n, Node* region, int policy) {
-  if (n->Opcode() == Op_ConvI2L && n->bottom_type() != TypeLong::LONG) {
-    // ConvI2L may have type information on it which is unsafe to push up
+  if ((n->Opcode() == Op_ConvI2L && n->bottom_type() != TypeLong::LONG) ||
+      (n->Opcode() == Op_ConvL2I && n->bottom_type() != TypeInt::INT)) {
+    // ConvI2L/ConvL2I may have type information on it which is unsafe to push up
     // so disable this for now
     return nullptr;
   }
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index fa85344d0da..cadea46e2c9 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -2878,6 +2878,15 @@ void Node::ensure_control_or_add_prec(Node* c) {
   }
 }
 
+void Node::add_prec_from(Node* n) {
+  for (uint i = n->req(); i < n->len(); i++) {
+    Node* prec = n->in(i);
+    if (prec != nullptr) {
+      add_prec(prec);
+    }
+  }
+}
+
 bool Node::is_dead_loop_safe() const {
   if (is_Phi()) {
     return true;
@@ -2901,6 +2910,9 @@ bool Node::is_dead_loop_safe() const {
   return false;
 }
 
+bool Node::is_div_or_mod(BasicType bt) const { return Opcode() == Op_Div(bt) || Opcode() == Op_Mod(bt) ||
+                                                      Opcode() == Op_UDiv(bt) || Opcode() == Op_UMod(bt); }
+
 //=============================================================================
 //------------------------------yank-------------------------------------------
 // Find and remove
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 04631dcbae2..412e193a612 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -1143,6 +1143,7 @@ class Node {
 
   // Set control or add control as precedence edge
   void ensure_control_or_add_prec(Node* c);
+  void add_prec_from(Node* n);
 
   // Visit boundary uses of the node and apply a callback function for each.
   // Recursively traverse uses, stopping and applying the callback when
@@ -1254,6 +1255,8 @@ class Node {
   // Whether this is a memory phi node
   bool is_memory_phi() const { return is_Phi() && bottom_type() == Type::MEMORY; }
 
+  bool is_div_or_mod(BasicType bt) const;
+
 //----------------- Printing, etc
 #ifndef PRODUCT
  public:
@@ -2023,6 +2026,10 @@ Op_IL(URShift)
 Op_IL(LShift)
 Op_IL(Xor)
 Op_IL(Cmp)
+Op_IL(Div)
+Op_IL(Mod)
+Op_IL(UDiv)
+Op_IL(UMod)
 
 inline int Op_ConIL(BasicType bt) {
   assert(bt == T_INT || bt == T_LONG, "only for int or longs");
diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp
index 2c021504785..3b4519623ad 100644
--- a/src/hotspot/share/opto/runtime.cpp
+++ b/src/hotspot/share/opto/runtime.cpp
@@ -1401,6 +1401,45 @@ const TypeFunc* OptoRuntime::poly1305_processBlocks_Type() {
   return TypeFunc::make(domain, range);
 }
 
+// MontgomeryIntegerPolynomialP256 multiply function
+const TypeFunc* OptoRuntime::intpoly_montgomeryMult_P256_Type() {
+  int argcnt = 3;
+
+  const Type** fields = TypeTuple::fields(argcnt);
+  int argp = TypeFunc::Parms;
+  fields[argp++] = TypePtr::NOTNULL;    // a array
+  fields[argp++] = TypePtr::NOTNULL;    // b array
+  fields[argp++] = TypePtr::NOTNULL;    // r(esult) array
+  assert(argp == TypeFunc::Parms + argcnt, "correct decoding");
+  const TypeTuple* domain = TypeTuple::make(TypeFunc::Parms+argcnt, fields);
+
+  // result type needed
+  fields = TypeTuple::fields(1);
+  fields[TypeFunc::Parms + 0] = TypeInt::INT; // carry bits in output
+  const TypeTuple* range = TypeTuple::make(TypeFunc::Parms+1, fields);
+  return TypeFunc::make(domain, range);
+}
+
+// IntegerPolynomial constant time assignment function
+const TypeFunc* OptoRuntime::intpoly_assign_Type() {
+  int argcnt = 4;
+
+  const Type** fields = TypeTuple::fields(argcnt);
+  int argp = TypeFunc::Parms;
+  fields[argp++] = TypeInt::INT;        // set flag
+  fields[argp++] = TypePtr::NOTNULL;    // a array (result)
+  fields[argp++] = TypePtr::NOTNULL;    // b array (if set is set)
+  fields[argp++] = TypeInt::INT;        // array length
+  assert(argp == TypeFunc::Parms + argcnt, "correct decoding");
+  const TypeTuple* domain = TypeTuple::make(TypeFunc::Parms+argcnt, fields);
+
+  // result type needed
+  fields = TypeTuple::fields(1);
+  fields[TypeFunc::Parms + 0] = NULL; // void
+  const TypeTuple* range = TypeTuple::make(TypeFunc::Parms, fields);
+  return TypeFunc::make(domain, range);
+}
+
 //------------- Interpreter state access for on stack replacement
 const TypeFunc* OptoRuntime::osr_end_Type() {
   // create input type (domain)
diff --git a/src/hotspot/share/opto/runtime.hpp b/src/hotspot/share/opto/runtime.hpp
index 30656044cbb..e4cbdf2f0d0 100644
--- a/src/hotspot/share/opto/runtime.hpp
+++ b/src/hotspot/share/opto/runtime.hpp
@@ -298,6 +298,8 @@ class OptoRuntime : public AllStatic {
   static const TypeFunc* base64_encodeBlock_Type();
   static const TypeFunc* base64_decodeBlock_Type();
   static const TypeFunc* poly1305_processBlocks_Type();
+  static const TypeFunc* intpoly_montgomeryMult_P256_Type();
+  static const TypeFunc* intpoly_assign_Type();
 
   static const TypeFunc* updateBytesCRC32_Type();
   static const TypeFunc* updateBytesCRC32C_Type();
diff --git a/src/hotspot/share/opto/type.cpp b/src/hotspot/share/opto/type.cpp
index 70b2c705cd3..690107f169c 100644
--- a/src/hotspot/share/opto/type.cpp
+++ b/src/hotspot/share/opto/type.cpp
@@ -4180,24 +4180,24 @@ const TypeInstPtr *TypeInstPtr::xmeet_unloaded(const TypeInstPtr *tinst, const T
     //
     assert(loaded->ptr() != TypePtr::Null, "insanity check");
     //
-    if (loaded->ptr() == TypePtr::TopPTR)        { return unloaded; }
+    if (loaded->ptr() == TypePtr::TopPTR)        { return unloaded->with_speculative(speculative); }
     else if (loaded->ptr() == TypePtr::AnyNull)  { return make(ptr, unloaded->klass(), interfaces, false, nullptr, off, instance_id, speculative, depth); }
-    else if (loaded->ptr() == TypePtr::BotPTR)   { return TypeInstPtr::BOTTOM; }
+    else if (loaded->ptr() == TypePtr::BotPTR)   { return TypeInstPtr::BOTTOM->with_speculative(speculative); }
     else if (loaded->ptr() == TypePtr::Constant || loaded->ptr() == TypePtr::NotNull) {
-      if (unloaded->ptr() == TypePtr::BotPTR)    { return TypeInstPtr::BOTTOM;  }
-      else                                       { return TypeInstPtr::NOTNULL; }
+      if (unloaded->ptr() == TypePtr::BotPTR)    { return TypeInstPtr::BOTTOM->with_speculative(speculative);  }
+      else                                       { return TypeInstPtr::NOTNULL->with_speculative(speculative); }
     }
-    else if (unloaded->ptr() == TypePtr::TopPTR) { return unloaded; }
+    else if (unloaded->ptr() == TypePtr::TopPTR) { return unloaded->with_speculative(speculative); }
 
-    return unloaded->cast_to_ptr_type(TypePtr::AnyNull)->is_instptr();
+    return unloaded->cast_to_ptr_type(TypePtr::AnyNull)->is_instptr()->with_speculative(speculative);
   }
 
   // Both are unloaded, not the same class, not Object
   // Or meet unloaded with a different loaded class, not java/lang/Object
   if (ptr != TypePtr::BotPTR) {
-    return TypeInstPtr::NOTNULL;
+    return TypeInstPtr::NOTNULL->with_speculative(speculative);
   }
-  return TypeInstPtr::BOTTOM;
+  return TypeInstPtr::BOTTOM->with_speculative(speculative);
 }
 
 
@@ -4600,6 +4600,10 @@ const TypeInstPtr* TypeInstPtr::remove_speculative() const {
               _instance_id, nullptr, _inline_depth);
 }
 
+const TypeInstPtr* TypeInstPtr::with_speculative(const TypePtr* speculative) const {
+  return make(_ptr, klass(), _interfaces, klass_is_exact(), const_oop(), _offset, _instance_id, speculative, _inline_depth);
+}
+
 const TypePtr* TypeInstPtr::with_inline_depth(int depth) const {
   if (!UseInlineDepthForSpeculativeTypes) {
     return this;
diff --git a/src/hotspot/share/opto/type.hpp b/src/hotspot/share/opto/type.hpp
index 1b11ed95367..b9883d51391 100644
--- a/src/hotspot/share/opto/type.hpp
+++ b/src/hotspot/share/opto/type.hpp
@@ -1356,6 +1356,7 @@ class TypeInstPtr : public TypeOopPtr {
 
   // Speculative type helper methods.
   virtual const TypeInstPtr* remove_speculative() const;
+  const TypeInstPtr* with_speculative(const TypePtr* speculative) const;
   virtual const TypePtr* with_inline_depth(int depth) const;
   virtual const TypePtr* with_instance_id(int instance_id) const;
 
diff --git a/src/hotspot/share/runtime/frame.cpp b/src/hotspot/share/runtime/frame.cpp
index 275f095af37..8f5d2ad4acb 100644
--- a/src/hotspot/share/runtime/frame.cpp
+++ b/src/hotspot/share/runtime/frame.cpp
@@ -950,7 +950,7 @@ void frame::oops_interpreted_do(OopClosure* f, const RegisterMap* map, bool quer
   ResourceMark rm(thread);
   InterpreterOopMap mask;
   if (query_oop_map_cache) {
-    m->mask_for(bci, &mask);
+    m->mask_for(m, bci, &mask);
   } else {
     OopMapCache::compute_one_oop_map(m, bci, &mask);
   }
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 3995a871474..6bfb260606b 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -233,6 +233,8 @@ const int ObjectAlignmentInBytes = 8;
                                                                             \
   product(bool, UsePoly1305Intrinsics, false, DIAGNOSTIC,                   \
           "Use intrinsics for sun.security.util.math.intpoly")              \
+  product(bool, UseIntPolyIntrinsics, false, DIAGNOSTIC,                   \
+          "Use intrinsics for sun.security.util.math.intpoly.MontgomeryIntegerPolynomialP256") \
                                                                             \
   product(size_t, LargePageSizeInBytes, 0,                                  \
           "Maximum large page size used (0 will use the default large "     \
@@ -473,9 +475,6 @@ const int ObjectAlignmentInBytes = 8;
   develop(bool, ZapUnusedHeapArea, trueInDebug,                             \
           "Zap unused heap space")                                          \
                                                                             \
-  develop(bool, CheckZapUnusedHeapArea, false,                              \
-          "Check zapping of unused heap space")                             \
-                                                                            \
   develop(bool, ZapFillerObjects, trueInDebug,                              \
           "Zap filler objects")                                             \
                                                                             \
@@ -542,11 +541,11 @@ const int ObjectAlignmentInBytes = 8;
                                                                             \
   product(bool, HeapDumpBeforeFullGC, false, MANAGEABLE,                    \
           "Dump heap to file before any major stop-the-world GC "           \
-          "(also see FullGCHeapDumpLimit)")                                 \
+          "(also see FullGCHeapDumpLimit, HeapDumpPath, HeapDumpGzipLevel)")\
                                                                             \
   product(bool, HeapDumpAfterFullGC, false, MANAGEABLE,                     \
           "Dump heap to file after any major stop-the-world GC "            \
-          "(also see FullGCHeapDumpLimit)")                                 \
+          "(also see FullGCHeapDumpLimit, HeapDumpPath, HeapDumpGzipLevel)")\
                                                                             \
   product(uint, FullGCHeapDumpLimit, 0, MANAGEABLE,                         \
           "Limit the number of heap dumps triggered by "                    \
@@ -555,15 +554,18 @@ const int ObjectAlignmentInBytes = 8;
                                                                             \
   product(bool, HeapDumpOnOutOfMemoryError, false, MANAGEABLE,              \
           "Dump heap to file when java.lang.OutOfMemoryError is thrown "    \
-          "from JVM")                                                       \
+          "from JVM "                                                       \
+          "(also see HeapDumpPath, HeapDumpGzipLevel)")                     \
                                                                             \
   product(ccstr, HeapDumpPath, nullptr, MANAGEABLE,                         \
-          "When HeapDumpOnOutOfMemoryError is on, the path (filename or "   \
+          "When HeapDumpOnOutOfMemoryError, HeapDumpBeforeFullGC "          \
+          "or HeapDumpAfterFullGC is on, the path (filename or "            \
           "directory) of the dump file (defaults to java_pid<pid>.hprof "   \
           "in the working directory)")                                      \
                                                                             \
   product(int, HeapDumpGzipLevel, 0, MANAGEABLE,                            \
-          "When HeapDumpOnOutOfMemoryError is on, the gzip compression "    \
+          "When HeapDumpOnOutOfMemoryError, HeapDumpBeforeFullGC "          \
+          "or HeapDumpAfterFullGC is on, the gzip compression "             \
           "level of the dump file. 0 (the default) disables gzip "          \
           "compression. Otherwise the level must be between 1 and 9.")      \
           range(0, 9)                                                       \
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index dec40136336..2587375c52e 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -268,6 +268,7 @@ void mutex_init() {
   MUTEX_DEFN(CompiledIC_lock                 , PaddedMutex  , nosafepoint);  // locks VtableStubs_lock, InlineCacheBuffer_lock
   MUTEX_DEFN(MethodCompileQueue_lock         , PaddedMonitor, safepoint);
   MUTEX_DEFN(CompileStatistics_lock          , PaddedMutex  , safepoint);
+  MUTEX_DEFN(DirectivesStack_lock            , PaddedMutex  , nosafepoint);
 
   MUTEX_DEFN(JvmtiThreadState_lock           , PaddedMutex  , safepoint);   // Used by JvmtiThreadState/JvmtiEventController
   MUTEX_DEFN(EscapeBarrier_lock              , PaddedMonitor, nosafepoint); // Used to synchronize object reallocation/relocking triggered by JVMTI
@@ -325,7 +326,6 @@ void mutex_init() {
   MUTEX_DEFL(InlineCacheBuffer_lock         , PaddedMutex  , CompiledIC_lock);
   MUTEX_DEFL(VtableStubs_lock               , PaddedMutex  , CompiledIC_lock);  // Also holds DumpTimeTable_lock
   MUTEX_DEFL(CodeCache_lock                 , PaddedMonitor, VtableStubs_lock);
-  MUTEX_DEFL(DirectivesStack_lock           , PaddedMutex  , CodeCache_lock);
   MUTEX_DEFL(NMethodState_lock              , PaddedMutex  , CodeCache_lock);
 
   MUTEX_DEFL(Threads_lock                   , PaddedMonitor, CompileThread_lock, true);
diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index d281acdf006..178f3e97d71 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -829,7 +829,6 @@ void ObjectMonitor::EnterI(JavaThread* current) {
   // to defer the state transitions until absolutely necessary,
   // and in doing so avoid some transitions ...
 
-  int nWakeups = 0;
   int recheckInterval = 1;
 
   for (;;) {
@@ -872,15 +871,14 @@ void ObjectMonitor::EnterI(JavaThread* current) {
     }
 
     // The lock is still contested.
+
     // Keep a tally of the # of futile wakeups.
     // Note that the counter is not protected by a lock or updated by atomics.
     // That is by design - we trade "lossy" counters which are exposed to
     // races during updates for a lower probe effect.
-
     // This PerfData object can be used in parallel with a safepoint.
     // See the work around in PerfDataManager::destroy().
     OM_PERFDATA_OP(FutileWakeups, inc());
-    ++nWakeups;
 
     // Assuming this is not a spurious wakeup we'll normally find _succ == current.
     // We can defer clearing _succ until after the spin completes
@@ -981,12 +979,18 @@ void ObjectMonitor::ReenterI(JavaThread* current, ObjectWaiter* currentNode) {
 
   assert(current->thread_state() != _thread_blocked, "invariant");
 
-  int nWakeups = 0;
   for (;;) {
     ObjectWaiter::TStates v = currentNode->TState;
     guarantee(v == ObjectWaiter::TS_ENTER || v == ObjectWaiter::TS_CXQ, "invariant");
     assert(owner_raw() != current, "invariant");
 
+    // This thread has been notified so try to reacquire the lock.
+    if (TryLock(current) == TryLockResult::Success) {
+      break;
+    }
+
+    // If that fails, spin again.  Note that spin count may be zero so the above TryLock
+    // is necessary.
     if (TrySpin(current)) {
         break;
     }
@@ -1011,11 +1015,6 @@ void ObjectMonitor::ReenterI(JavaThread* current, ObjectWaiter* currentNode) {
     }
 
     // The lock is still contested.
-    // Keep a tally of the # of futile wakeups.
-    // Note that the counter is not protected by a lock or updated by atomics.
-    // That is by design - we trade "lossy" counters which are exposed to
-    // races during updates for a lower probe effect.
-    ++nWakeups;
 
     // Assuming this is not a spurious wakeup we'll normally
     // find that _succ == current.
@@ -1025,6 +1024,10 @@ void ObjectMonitor::ReenterI(JavaThread* current, ObjectWaiter* currentNode) {
     // *must* retry  _owner before parking.
     OrderAccess::fence();
 
+    // Keep a tally of the # of futile wakeups.
+    // Note that the counter is not protected by a lock or updated by atomics.
+    // That is by design - we trade "lossy" counters which are exposed to
+    // races during updates for a lower probe effect.
     // This PerfData object can be used in parallel with a safepoint.
     // See the work around in PerfDataManager::destroy().
     OM_PERFDATA_OP(FutileWakeups, inc());
diff --git a/src/hotspot/share/runtime/serviceThread.cpp b/src/hotspot/share/runtime/serviceThread.cpp
index a5082fad479..f02e5062e67 100644
--- a/src/hotspot/share/runtime/serviceThread.cpp
+++ b/src/hotspot/share/runtime/serviceThread.cpp
@@ -33,6 +33,7 @@
 #include "gc/shared/oopStorage.hpp"
 #include "gc/shared/oopStorageSet.hpp"
 #include "memory/universe.hpp"
+#include "interpreter/oopMapCache.hpp"
 #include "oops/oopHandle.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
@@ -95,6 +96,7 @@ void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) {
     bool oop_handles_to_release = false;
     bool cldg_cleanup_work = false;
     bool jvmti_tagmap_work = false;
+    bool oopmap_cache_work = false;
     {
       // Need state transition ThreadBlockInVM so that this thread
       // will be handled by safepoint correctly when this thread is
@@ -124,7 +126,8 @@ void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) {
               (oopstorage_work = OopStorage::has_cleanup_work_and_reset()) |
               (oop_handles_to_release = JavaThread::has_oop_handles_to_release()) |
               (cldg_cleanup_work = ClassLoaderDataGraph::should_clean_metaspaces_and_reset()) |
-              (jvmti_tagmap_work = JvmtiTagMap::has_object_free_events_and_reset())
+              (jvmti_tagmap_work = JvmtiTagMap::has_object_free_events_and_reset()) |
+              (oopmap_cache_work = OopMapCache::has_cleanup_work())
              ) == 0) {
         // Wait until notified that there is some work to do or timer expires.
         // Some cleanup requests don't notify the ServiceThread so work needs to be done at periodic intervals.
@@ -196,6 +199,10 @@ void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) {
     if (jvmti_tagmap_work) {
       JvmtiTagMap::flush_all_object_free_events();
     }
+
+    if (oopmap_cache_work) {
+      OopMapCache::cleanup();
+    }
   }
 }
 
diff --git a/src/hotspot/share/runtime/stubRoutines.cpp b/src/hotspot/share/runtime/stubRoutines.cpp
index f52255f504d..74286a4ac98 100644
--- a/src/hotspot/share/runtime/stubRoutines.cpp
+++ b/src/hotspot/share/runtime/stubRoutines.cpp
@@ -132,6 +132,8 @@ address StubRoutines::_chacha20Block                       = nullptr;
 address StubRoutines::_base64_encodeBlock                  = nullptr;
 address StubRoutines::_base64_decodeBlock                  = nullptr;
 address StubRoutines::_poly1305_processBlocks              = nullptr;
+address StubRoutines::_intpoly_montgomeryMult_P256         = nullptr;
+address StubRoutines::_intpoly_assign                      = nullptr;
 
 address StubRoutines::_md5_implCompress      = nullptr;
 address StubRoutines::_md5_implCompressMB    = nullptr;
diff --git a/src/hotspot/share/runtime/stubRoutines.hpp b/src/hotspot/share/runtime/stubRoutines.hpp
index fe32c9613c8..65b0c0d2f26 100644
--- a/src/hotspot/share/runtime/stubRoutines.hpp
+++ b/src/hotspot/share/runtime/stubRoutines.hpp
@@ -215,6 +215,8 @@ class StubRoutines: AllStatic {
   static address _base64_encodeBlock;
   static address _base64_decodeBlock;
   static address _poly1305_processBlocks;
+  static address _intpoly_montgomeryMult_P256;
+  static address _intpoly_assign;
 
   static address _md5_implCompress;
   static address _md5_implCompressMB;
@@ -409,6 +411,8 @@ class StubRoutines: AllStatic {
   static address electronicCodeBook_encryptAESCrypt()   { return _electronicCodeBook_encryptAESCrypt; }
   static address electronicCodeBook_decryptAESCrypt()   { return _electronicCodeBook_decryptAESCrypt; }
   static address poly1305_processBlocks()               { return _poly1305_processBlocks; }
+  static address intpoly_montgomeryMult_P256()          { return _intpoly_montgomeryMult_P256; }
+  static address intpoly_assign()        { return _intpoly_assign; }
   static address counterMode_AESCrypt()  { return _counterMode_AESCrypt; }
   static address ghash_processBlocks()   { return _ghash_processBlocks; }
   static address chacha20Block()         { return _chacha20Block; }
diff --git a/src/hotspot/share/runtime/vmOperation.hpp b/src/hotspot/share/runtime/vmOperation.hpp
index f6991d78f8e..47eff632a39 100644
--- a/src/hotspot/share/runtime/vmOperation.hpp
+++ b/src/hotspot/share/runtime/vmOperation.hpp
@@ -50,8 +50,8 @@
   template(CollectForMetadataAllocation)          \
   template(CollectForCodeCacheAllocation)         \
   template(GC_HeapInspection)                     \
-  template(GenCollectFull)                        \
-  template(GenCollectForAllocation)               \
+  template(SerialCollectForAllocation)            \
+  template(SerialGCCollect)                       \
   template(ParallelGCFailedAllocation)            \
   template(ParallelGCSystemGC)                    \
   template(G1CollectForAllocation)                \
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index cc1351e2742..4381bb973bb 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -253,6 +253,7 @@
   nonstatic_field(InstanceKlass,               _jni_ids,                                      JNIid*)                                \
   nonstatic_field(InstanceKlass,               _osr_nmethods_head,                            nmethod*)                              \
   JVMTI_ONLY(nonstatic_field(InstanceKlass,    _breakpoints,                                  BreakpointInfo*))                      \
+  volatile_nonstatic_field(InstanceKlass,      _methods_jmethod_ids,                          jmethodID*)                            \
   volatile_nonstatic_field(InstanceKlass,      _idnum_allocated_count,                        u2)                                    \
   nonstatic_field(InstanceKlass,               _annotations,                                  Annotations*)                          \
   nonstatic_field(InstanceKlass,               _method_ordering,                              Array<int>*)                           \
diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp
index 06fcad88d06..6e6a7172290 100644
--- a/src/hotspot/share/services/diagnosticCommand.cpp
+++ b/src/hotspot/share/services/diagnosticCommand.cpp
@@ -144,7 +144,6 @@ void DCmd::register_dcmds(){
 
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesPrintDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesAddDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesReplaceDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesRemoveDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesClearDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilationMemoryStatisticDCmd>(full_export, true, false));
@@ -924,81 +923,21 @@ void CompilerDirectivesPrintDCmd::execute(DCmdSource source, TRAPS) {
 
 CompilerDirectivesAddDCmd::CompilerDirectivesAddDCmd(outputStream* output, bool heap) :
                            DCmdWithParser(output, heap),
-  _filename("filename", "Name of the directives file", "STRING", true),
-  _refresh("-r", "Refresh affected methods", "BOOLEAN", false, "false") {
-
+  _filename("filename","Name of the directives file", "STRING",true) {
   _dcmdparser.add_dcmd_argument(&_filename);
-  _dcmdparser.add_dcmd_option(&_refresh);
 }
 
 void CompilerDirectivesAddDCmd::execute(DCmdSource source, TRAPS) {
   DirectivesParser::parse_from_file(_filename.value(), output(), true);
-  if (_refresh.value()) {
-    CodeCache::mark_directives_matches(true);
-    CodeCache::recompile_marked_directives_matches();
-  }
-}
-
-CompilerDirectivesReplaceDCmd::CompilerDirectivesReplaceDCmd(outputStream* output, bool heap) :
-                           DCmdWithParser(output, heap),
-  _filename("filename", "Name of the directives file", "STRING", true),
-  _refresh("-r", "Refresh affected methods", "BOOLEAN", false, "false") {
-
-  _dcmdparser.add_dcmd_argument(&_filename);
-  _dcmdparser.add_dcmd_option(&_refresh);
-}
-
-void CompilerDirectivesReplaceDCmd::execute(DCmdSource source, TRAPS) {
-  // Need to mark the methods twice, to account for the method that doesn't match
-  // the directives anymore
-  if (_refresh.value()) {
-    CodeCache::mark_directives_matches();
-
-    DirectivesStack::clear();
-    DirectivesParser::parse_from_file(_filename.value(), output(), true);
-
-    CodeCache::mark_directives_matches();
-    CodeCache::recompile_marked_directives_matches();
-  } else {
-    DirectivesStack::clear();
-    DirectivesParser::parse_from_file(_filename.value(), output(), true);
-  }
-}
-
-CompilerDirectivesRemoveDCmd::CompilerDirectivesRemoveDCmd(outputStream* output, bool heap) :
-                           DCmdWithParser(output, heap),
-  _refresh("-r", "Refresh affected methods", "BOOLEAN", false, "false") {
-
-  _dcmdparser.add_dcmd_option(&_refresh);
 }
 
 void CompilerDirectivesRemoveDCmd::execute(DCmdSource source, TRAPS) {
-  if (_refresh.value()) {
-    CodeCache::mark_directives_matches(true);
-    DirectivesStack::pop(1);
-    CodeCache::recompile_marked_directives_matches();
-  } else {
-    DirectivesStack::pop(1);
-  }
-}
-
-CompilerDirectivesClearDCmd::CompilerDirectivesClearDCmd(outputStream* output, bool heap) :
-                           DCmdWithParser(output, heap),
-  _refresh("-r", "Refresh affected methods", "BOOLEAN", false, "false") {
-
-  _dcmdparser.add_dcmd_option(&_refresh);
+  DirectivesStack::pop(1);
 }
 
 void CompilerDirectivesClearDCmd::execute(DCmdSource source, TRAPS) {
-  if (_refresh.value()) {
-    CodeCache::mark_directives_matches();
-    DirectivesStack::clear();
-    CodeCache::recompile_marked_directives_matches();
-  } else {
-    DirectivesStack::clear();
-  }
+  DirectivesStack::clear();
 }
-
 #if INCLUDE_SERVICES
 ClassHierarchyDCmd::ClassHierarchyDCmd(outputStream* output, bool heap) :
                                        DCmdWithParser(output, heap),
diff --git a/src/hotspot/share/services/diagnosticCommand.hpp b/src/hotspot/share/services/diagnosticCommand.hpp
index f87d6d277da..88a48970810 100644
--- a/src/hotspot/share/services/diagnosticCommand.hpp
+++ b/src/hotspot/share/services/diagnosticCommand.hpp
@@ -688,12 +688,9 @@ class CompilerDirectivesPrintDCmd : public DCmd {
   virtual void execute(DCmdSource source, TRAPS);
 };
 
-class CompilerDirectivesRemoveDCmd : public DCmdWithParser {
-protected:
-  DCmdArgument<bool> _refresh; // true if update should be forced after directives changes.
+class CompilerDirectivesRemoveDCmd : public DCmd {
 public:
-  static int num_arguments() { return 1; }
-  CompilerDirectivesRemoveDCmd(outputStream* output, bool heap);
+  CompilerDirectivesRemoveDCmd(outputStream* output, bool heap) : DCmd(output, heap) {}
   static const char* name() {
     return "Compiler.directives_remove";
   }
@@ -714,9 +711,8 @@ class CompilerDirectivesRemoveDCmd : public DCmdWithParser {
 class CompilerDirectivesAddDCmd : public DCmdWithParser {
 protected:
   DCmdArgument<char*> _filename;
-  DCmdArgument<bool> _refresh; // true if update should be forced after directives changes.
 public:
-  static int num_arguments() { return 2; }
+  static int num_arguments() { return 1; }
   CompilerDirectivesAddDCmd(outputStream* output, bool heap);
   static const char* name() {
     return "Compiler.directives_add";
@@ -735,36 +731,9 @@ class CompilerDirectivesAddDCmd : public DCmdWithParser {
   virtual void execute(DCmdSource source, TRAPS);
 };
 
-class CompilerDirectivesReplaceDCmd : public DCmdWithParser {
-protected:
-  DCmdArgument<char*> _filename;
-  DCmdArgument<bool> _refresh; // true if update should be forced after directives changes.
-public:
-  static int num_arguments() { return 2; }
-  CompilerDirectivesReplaceDCmd(outputStream* output, bool heap);
-  static const char* name() {
-    return "Compiler.directives_replace";
-  }
-  static const char* description() {
-    return "Clear directives stack, and load new compiler directives from file.";
-  }
-  static const char* impact() {
-    return "Low";
-  }
-  static const JavaPermission permission() {
-    JavaPermission p = {"java.lang.management.ManagementPermission",
-                        "monitor", NULL};
-    return p;
-  }
-  virtual void execute(DCmdSource source, TRAPS);
-};
-
-class CompilerDirectivesClearDCmd : public DCmdWithParser {
-protected:
-  DCmdArgument<bool> _refresh; // true if update should be forced after directives changes.
+class CompilerDirectivesClearDCmd : public DCmd {
 public:
-  static int num_arguments() { return 1; }
-  CompilerDirectivesClearDCmd(outputStream* output, bool heap);
+  CompilerDirectivesClearDCmd(outputStream* output, bool heap) : DCmd(output, heap) {}
   static const char* name() {
     return "Compiler.directives_clear";
   }
diff --git a/src/hotspot/share/utilities/growableArray.hpp b/src/hotspot/share/utilities/growableArray.hpp
index 39118e38f5c..c3c64762942 100644
--- a/src/hotspot/share/utilities/growableArray.hpp
+++ b/src/hotspot/share/utilities/growableArray.hpp
@@ -287,10 +287,12 @@ class GrowableArrayView : public GrowableArrayBase {
   }
 
   void sort(int f(E*, E*)) {
+    if (_data == nullptr) return;
     qsort(_data, length(), sizeof(E), (_sort_Fn)f);
   }
   // sort by fixed-stride sub arrays:
   void sort(int f(E*, E*), int stride) {
+    if (_data == nullptr) return;
     qsort(_data, length() / stride, sizeof(E) * stride, (_sort_Fn)f);
   }
 
diff --git a/src/java.base/share/classes/java/io/Console.java b/src/java.base/share/classes/java/io/Console.java
index bbf2e39eb48..45f5dddafb2 100644
--- a/src/java.base/share/classes/java/io/Console.java
+++ b/src/java.base/share/classes/java/io/Console.java
@@ -62,6 +62,11 @@
  * on the objects returned by {@link #reader()} and {@link #writer()} may
  * block in multithreaded scenarios.
  * <p>
+ * Operations that format strings are locale sensitive, using either the
+ * specified {@code Locale}, or the
+ * {@link Locale##default_locale default format Locale} to produce localized
+ * formatted strings.
+ * <p>
  * Invoking {@code close()} on the objects returned by the {@link #reader()}
  * and the {@link #writer()} will not close the underlying stream of those
  * objects.
@@ -147,11 +152,51 @@ public Reader reader() {
 
     /**
      * Writes a formatted string to this console's output stream using
-     * the specified format string and arguments.
+     * the specified format string and arguments with the
+     * {@link Locale##default_locale default format locale}.
+     *
+     * @param  format
+     *         A format string as described in {@link
+     *         Formatter##syntax Format string syntax}.
+     *
+     * @param  args
+     *         Arguments referenced by the format specifiers in the format
+     *         string.  If there are more arguments than format specifiers, the
+     *         extra arguments are ignored.  The number of arguments is
+     *         variable and may be zero.  The maximum number of arguments is
+     *         limited by the maximum dimension of a Java array as defined by
+     *         <cite>The Java Virtual Machine Specification</cite>.
+     *         The behavior on a
+     *         {@code null} argument depends on the {@link
+     *         Formatter##syntax conversion}.
+     *
+     * @throws  IllegalFormatException
+     *          If a format string contains an illegal syntax, a format
+     *          specifier that is incompatible with the given arguments,
+     *          insufficient arguments given the format string, or other
+     *          illegal conditions.  For specification of all possible
+     *          formatting errors, see the {@link
+     *          Formatter##detail Details} section
+     *          of the formatter class specification.
+     *
+     * @return  This console
+     */
+    public Console format(String format, Object ... args) {
+        throw newUnsupportedOperationException();
+    }
+
+    /**
+     * Writes a formatted string to this console's output stream using
+     * the specified format string and arguments with the specified
+     * {@code locale}.
      *
-     * @param  fmt
-     *         A format string as described in <a
-     *         href="../util/Formatter.html#syntax">Format string syntax</a>.
+     * @param  locale The {@linkplain Locale locale} to apply during
+     *         formatting.  If {@code locale} is {@code null} then no localization
+     *         is applied.
+     *
+     * @param  format
+     *         A format string as described in {@link
+     *         Formatter##syntax Format string syntax}.
      *
      * @param  args
      *         Arguments referenced by the format specifiers in the format
@@ -160,39 +205,36 @@ public Reader reader() {
      *         variable and may be zero.  The maximum number of arguments is
      *         limited by the maximum dimension of a Java array as defined by
      *         <cite>The Java Virtual Machine Specification</cite>.
-     *         The behaviour on a
-     *         {@code null} argument depends on the <a
-     *         href="../util/Formatter.html#syntax">conversion</a>.
+     *         The behavior on a
+     *         {@code null} argument depends on the {@link
+     *         Formatter##syntax conversion}.
      *
      * @throws  IllegalFormatException
      *          If a format string contains an illegal syntax, a format
      *          specifier that is incompatible with the given arguments,
      *          insufficient arguments given the format string, or other
      *          illegal conditions.  For specification of all possible
-     *          formatting errors, see the <a
-     *          href="../util/Formatter.html#detail">Details</a> section
+     *          formatting errors, see the {@link
+     *          Formatter##detail Details} section
      *          of the formatter class specification.
      *
      * @return  This console
+     * @since   23
      */
-    public Console format(String fmt, Object ...args) {
+    public Console format(Locale locale, String format, Object ... args) {
         throw newUnsupportedOperationException();
     }
 
     /**
      * A convenience method to write a formatted string to this console's
-     * output stream using the specified format string and arguments.
+     * output stream using the specified format string and arguments with
+     * the {@link Locale##default_locale default format locale}.
      *
-     * <p> An invocation of this method of the form
-     * {@code con.printf(format, args)} behaves in exactly the same way
-     * as the invocation of
-     * {@snippet lang=java :
-     *     con.format(format, args)
-     * }
+     * @implSpec This is the same as calling {@code format(format, args)}.
      *
      * @param  format
-     *         A format string as described in <a
-     *         href="../util/Formatter.html#syntax">Format string syntax</a>.
+     *         A format string as described in {@link
+     *         Formatter##syntax Format string syntax}.
      *
      * @param  args
      *         Arguments referenced by the format specifiers in the format
@@ -201,17 +243,17 @@ public Console format(String fmt, Object ...args) {
      *         variable and may be zero.  The maximum number of arguments is
      *         limited by the maximum dimension of a Java array as defined by
      *         <cite>The Java Virtual Machine Specification</cite>.
-     *         The behaviour on a
-     *         {@code null} argument depends on the <a
-     *         href="../util/Formatter.html#syntax">conversion</a>.
+     *         The behavior on a
+     *         {@code null} argument depends on the {@link
+     *         Formatter##syntax conversion}.
      *
      * @throws  IllegalFormatException
      *          If a format string contains an illegal syntax, a format
      *          specifier that is incompatible with the given arguments,
      *          insufficient arguments given the format string, or other
      *          illegal conditions.  For specification of all possible
-     *          formatting errors, see the <a
-     *          href="../util/Formatter.html#detail">Details</a> section of the
+     *          formatting errors, see the {@link
+     *          Formatter##detail Details} section of the
      *          formatter class specification.
      *
      * @return  This console
@@ -221,28 +263,76 @@ public Console printf(String format, Object ... args) {
     }
 
     /**
-     * Provides a formatted prompt, then reads a single line of text from the
-     * console.
+     * A convenience method to write a formatted string to this console's
+     * output stream using the specified format string and arguments with
+     * the specified {@code locale}.
+     *
+     * @implSpec This is the same as calling
+     *         {@code format(locale, format, args)}.
+     *
+     * @param  locale The {@linkplain Locale locale} to apply during
+     *         formatting.  If {@code locale} is {@code null} then no localization
+     *         is applied.
+     *
+     * @param  format
+     *         A format string as described in {@link
+     *         Formatter##syntax Format string syntax}.
+     *
+     * @param  args
+     *         Arguments referenced by the format specifiers in the format
+     *         string.  If there are more arguments than format specifiers, the
+     *         extra arguments are ignored.  The number of arguments is
+     *         variable and may be zero.  The maximum number of arguments is
+     *         limited by the maximum dimension of a Java array as defined by
+     *         <cite>The Java Virtual Machine Specification</cite>.
+     *         The behavior on a
+     *         {@code null} argument depends on the {@link
+     *         Formatter##syntax conversion}.
+     *
+     * @throws  IllegalFormatException
+     *          If a format string contains an illegal syntax, a format
+     *          specifier that is incompatible with the given arguments,
+     *          insufficient arguments given the format string, or other
+     *          illegal conditions.  For specification of all possible
+     *          formatting errors, see the {@link
+     *          Formatter##detail Details} section of the
+     *          formatter class specification.
+     *
+     * @return  This console
+     * @since   23
+     */
+    public Console printf(Locale locale, String format, Object ... args) {
+        throw newUnsupportedOperationException();
+    }
+
+    /**
+     * Provides a formatted prompt using the
+     * {@link Locale##default_locale default format locale}, then reads a
+     * single line of text from the console.
      *
-     * @param  fmt
-     *         A format string as described in <a
-     *         href="../util/Formatter.html#syntax">Format string syntax</a>.
+     * @param  format
+     *         A format string as described in {@link
+     *         Formatter##syntax Format string syntax}.
      *
      * @param  args
      *         Arguments referenced by the format specifiers in the format
      *         string.  If there are more arguments than format specifiers, the
-     *         extra arguments are ignored.  The maximum number of arguments is
+     *         extra arguments are ignored.  The number of arguments is
+     *         variable and may be zero.  The maximum number of arguments is
      *         limited by the maximum dimension of a Java array as defined by
      *         <cite>The Java Virtual Machine Specification</cite>.
+     *         The behavior on a
+     *         {@code null} argument depends on the {@link
+     *         Formatter##syntax conversion}.
      *
      * @throws  IllegalFormatException
      *          If a format string contains an illegal syntax, a format
      *          specifier that is incompatible with the given arguments,
      *          insufficient arguments given the format string, or other
      *          illegal conditions.  For specification of all possible
-     *          formatting errors, see the <a
-     *          href="../util/Formatter.html#detail">Details</a> section
-     *          of the formatter class specification.
+     *          formatting errors, see the {@link
+     *          Formatter##detail Details} section of the
+     *          formatter class specification.
      *
      * @throws IOError
      *         If an I/O error occurs.
@@ -251,7 +341,51 @@ public Console printf(String format, Object ... args) {
      *          including any line-termination characters, or {@code null}
      *          if an end of stream has been reached.
      */
-    public String readLine(String fmt, Object ... args) {
+    public String readLine(String format, Object ... args) {
+        throw newUnsupportedOperationException();
+    }
+
+    /**
+     * Provides a formatted prompt using the specified {@code locale}, then
+     * reads a single line of text from the console.
+     *
+     * @param  locale The {@linkplain Locale locale} to apply during
+     *         formatting.  If {@code locale} is {@code null} then no localization
+     *         is applied.
+     *
+     * @param  format
+     *         A format string as described in {@link
+     *         Formatter##syntax Format string syntax}.
+     *
+     * @param  args
+     *         Arguments referenced by the format specifiers in the format
+     *         string.  If there are more arguments than format specifiers, the
+     *         extra arguments are ignored.  The number of arguments is
+     *         variable and may be zero.  The maximum number of arguments is
+     *         limited by the maximum dimension of a Java array as defined by
+     *         <cite>The Java Virtual Machine Specification</cite>.
+     *         The behavior on a
+     *         {@code null} argument depends on the {@link
+     *         Formatter##syntax conversion}.
+     *
+     * @throws  IllegalFormatException
+     *          If a format string contains an illegal syntax, a format
+     *          specifier that is incompatible with the given arguments,
+     *          insufficient arguments given the format string, or other
+     *          illegal conditions.  For specification of all possible
+     *          formatting errors, see the {@link
+     *          Formatter##detail Details} section of the
+     *          formatter class specification.
+     *
+     * @throws IOError
+     *         If an I/O error occurs.
+     *
+     * @return  A string containing the line read from the console, not
+     *          including any line-termination characters, or {@code null}
+     *          if an end of stream has been reached.
+     * @since   23
+     */
+    public String readLine(Locale locale, String format, Object ... args) {
         throw newUnsupportedOperationException();
     }
 
@@ -270,29 +404,78 @@ public String readLine() {
     }
 
     /**
-     * Provides a formatted prompt, then reads a password or passphrase from
-     * the console with echoing disabled.
+     * Provides a formatted prompt using the
+     * {@link Locale##default_locale default format locale}, then reads a
+     * password or passphrase from the console with echoing disabled.
      *
-     * @param  fmt
-     *         A format string as described in <a
-     *         href="../util/Formatter.html#syntax">Format string syntax</a>
+     * @param  format
+     *         A format string as described in {@link
+     *         Formatter##syntax Format string syntax}
      *         for the prompt text.
      *
      * @param  args
      *         Arguments referenced by the format specifiers in the format
      *         string.  If there are more arguments than format specifiers, the
-     *         extra arguments are ignored.  The maximum number of arguments is
+     *         extra arguments are ignored.  The number of arguments is
+     *         variable and may be zero.  The maximum number of arguments is
      *         limited by the maximum dimension of a Java array as defined by
      *         <cite>The Java Virtual Machine Specification</cite>.
+     *         The behavior on a
+     *         {@code null} argument depends on the {@link
+     *         Formatter##syntax conversion}.
      *
      * @throws  IllegalFormatException
      *          If a format string contains an illegal syntax, a format
      *          specifier that is incompatible with the given arguments,
      *          insufficient arguments given the format string, or other
      *          illegal conditions.  For specification of all possible
-     *          formatting errors, see the <a
-     *          href="../util/Formatter.html#detail">Details</a>
-     *          section of the formatter class specification.
+     *          formatting errors, see the {@link
+     *          Formatter##detail Details} section of the
+     *          formatter class specification.
+     *
+     * @throws IOError
+     *         If an I/O error occurs.
+     *
+     * @return  A character array containing the password or passphrase read
+     *          from the console, not including any line-termination characters,
+     *          or {@code null} if an end of stream has been reached.
+     */
+    public char[] readPassword(String format, Object ... args) {
+        throw newUnsupportedOperationException();
+    }
+
+    /**
+     * Provides a formatted prompt using the specified {@code locale}, then
+     * reads a password or passphrase from the console with echoing disabled.
+     *
+     * @param  locale The {@linkplain Locale locale} to apply during
+     *         formatting.  If {@code locale} is {@code null} then no localization
+     *         is applied.
+     *
+     * @param  format
+     *         A format string as described in {@link
+     *         Formatter##syntax Format string syntax}
+     *         for the prompt text.
+     *
+     * @param  args
+     *         Arguments referenced by the format specifiers in the format
+     *         string.  If there are more arguments than format specifiers, the
+     *         extra arguments are ignored.  The number of arguments is
+     *         variable and may be zero.  The maximum number of arguments is
+     *         limited by the maximum dimension of a Java array as defined by
+     *         <cite>The Java Virtual Machine Specification</cite>.
+     *         The behavior on a
+     *         {@code null} argument depends on the {@link
+     *         Formatter##syntax conversion}.
+     *
+     * @throws  IllegalFormatException
+     *          If a format string contains an illegal syntax, a format
+     *          specifier that is incompatible with the given arguments,
+     *          insufficient arguments given the format string, or other
+     *          illegal conditions.  For specification of all possible
+     *          formatting errors, see the {@link
+     *          Formatter##detail Details} section of the
+     *          formatter class specification.
      *
      * @throws IOError
      *         If an I/O error occurs.
@@ -300,8 +483,9 @@ public String readLine() {
      * @return  A character array containing the password or passphrase read
      *          from the console, not including any line-termination characters,
      *          or {@code null} if an end of stream has been reached.
+     * @since   23
      */
-    public char[] readPassword(String fmt, Object ... args) {
+    public char[] readPassword(Locale locale, String format, Object ... args) {
         throw newUnsupportedOperationException();
     }
 
diff --git a/src/java.base/share/classes/java/io/ObjectInputStream.java b/src/java.base/share/classes/java/io/ObjectInputStream.java
index 502db6a1a21..74c34d80a7b 100644
--- a/src/java.base/share/classes/java/io/ObjectInputStream.java
+++ b/src/java.base/share/classes/java/io/ObjectInputStream.java
@@ -2358,7 +2358,13 @@ private void readExternalData(Externalizable obj, ObjectStreamClass desc)
          */
     }
 
-    /** Reads a record. */
+    /**
+     * Reads and returns a record.
+     * If an exception is marked for any of the fields, the dependency
+     * mechanism marks the record as having an exception.
+     * Null is returned from readRecord and later the exception is thrown at
+     * the exit of {@link #readObject(Class)}.
+     **/
     private Object readRecord(ObjectStreamClass desc) throws IOException {
         ObjectStreamClass.ClassDataSlot[] slots = desc.getClassDataLayout();
         if (slots.length != 1) {
@@ -2371,6 +2377,9 @@ private Object readRecord(ObjectStreamClass desc) throws IOException {
         }
 
         FieldValues fieldValues = new FieldValues(desc, true);
+        if (handles.lookupException(passHandle) != null) {
+            return null;     // slot marked with exception, don't create record
+        }
 
         // get canonical record constructor adapted to take two arguments:
         // - byte[] primValues
@@ -2464,8 +2473,11 @@ private void readSerialData(Object obj, ObjectStreamClass desc)
                     if (slotValues != null) {
                         slotValues[i] = values;
                     } else if (obj != null) {
-                        values.defaultCheckFieldValues(obj);
-                        values.defaultSetFieldValues(obj);
+                        if (handles.lookupException(passHandle) == null) {
+                            // passHandle NOT marked with an exception; set field values
+                            values.defaultCheckFieldValues(obj);
+                            values.defaultSetFieldValues(obj);
+                        }
                     }
                 }
 
@@ -2484,7 +2496,8 @@ private void readSerialData(Object obj, ObjectStreamClass desc)
             }
         }
 
-        if (obj != null && slotValues != null) {
+        if (obj != null && slotValues != null && handles.lookupException(passHandle) == null) {
+            // passHandle NOT marked with an exception
             // Check that the non-primitive types are assignable for all slots
             // before assigning.
             for (int i = 0; i < slots.length; i++) {
diff --git a/src/java.base/share/classes/java/io/ProxyingConsole.java b/src/java.base/share/classes/java/io/ProxyingConsole.java
index 0e8a6e83301..2179afa31c0 100644
--- a/src/java.base/share/classes/java/io/ProxyingConsole.java
+++ b/src/java.base/share/classes/java/io/ProxyingConsole.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
 package java.io;
 
 import java.nio.charset.Charset;
+import java.util.Locale;
+
 import jdk.internal.io.JdkConsole;
 
 /**
@@ -83,9 +85,17 @@ public Reader reader() {
      * {@inheritDoc}
      */
     @Override
-    public Console format(String fmt, Object ... args) {
+    public Console format(String format, Object ... args) {
+        return format(Locale.getDefault(Locale.Category.FORMAT), format, args);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Console format(Locale locale, String format, Object ... args) {
         synchronized (writeLock) {
-            delegate.format(fmt, args);
+            delegate.format(locale, format, args);
         }
         return this;
     }
@@ -95,8 +105,16 @@ public Console format(String fmt, Object ... args) {
      */
     @Override
     public Console printf(String format, Object ... args) {
+        return printf(Locale.getDefault(Locale.Category.FORMAT), format, args);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Console printf(Locale locale, String format, Object ... args) {
         synchronized (writeLock) {
-            delegate.printf(format, args);
+            delegate.format(locale, format, args);
         }
         return this;
     }
@@ -105,10 +123,18 @@ public Console printf(String format, Object ... args) {
      * {@inheritDoc}
      */
     @Override
-    public String readLine(String fmt, Object ... args) {
+    public String readLine(String format, Object ... args) {
+        return readLine(Locale.getDefault(Locale.Category.FORMAT), format, args);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String readLine(Locale locale, String format, Object ... args) {
         synchronized (writeLock) {
             synchronized (readLock) {
-                return delegate.readLine(fmt, args);
+                return delegate.readLine(locale, format, args);
             }
         }
     }
@@ -127,10 +153,18 @@ public String readLine() {
      * {@inheritDoc}
      */
     @Override
-    public char[] readPassword(String fmt, Object ... args) {
+    public char[] readPassword(String format, Object ... args) {
+        return readPassword(Locale.getDefault(Locale.Category.FORMAT), format, args);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public char[] readPassword(Locale locale, String format, Object ... args) {
         synchronized (writeLock) {
             synchronized (readLock) {
-                return delegate.readPassword(fmt, args);
+                return delegate.readPassword(locale, format, args);
             }
         }
     }
diff --git a/src/java.base/share/classes/java/lang/classfile/BufWriter.java b/src/java.base/share/classes/java/lang/classfile/BufWriter.java
index f178b6b2db0..11d6a4501f0 100644
--- a/src/java.base/share/classes/java/lang/classfile/BufWriter.java
+++ b/src/java.base/share/classes/java/lang/classfile/BufWriter.java
@@ -24,7 +24,6 @@
  */
 package java.lang.classfile;
 
-import java.nio.ByteBuffer;
 import java.util.List;
 
 import java.lang.classfile.constantpool.ConstantPool;
@@ -192,11 +191,6 @@ public sealed interface BufWriter
      */
     int size();
 
-    /**
-     * {@return a {@link java.nio.ByteBuffer ByteBuffer} view of the bytes in the buffer}
-     */
-    ByteBuffer asByteBuffer();
-
     /**
      * Copy the contents of the buffer into a byte array.
      *
diff --git a/src/java.base/share/classes/java/lang/constant/ClassDesc.java b/src/java.base/share/classes/java/lang/constant/ClassDesc.java
index 89be851dbf5..130a81420b6 100644
--- a/src/java.base/share/classes/java/lang/constant/ClassDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/ClassDesc.java
@@ -28,14 +28,19 @@
 import java.lang.invoke.TypeDescriptor;
 import java.util.stream.Stream;
 
+import jdk.internal.constant.PrimitiveClassDescImpl;
+import jdk.internal.constant.ReferenceClassDescImpl;
 import sun.invoke.util.Wrapper;
 
-import static java.lang.constant.ConstantUtils.binaryToInternal;
-import static java.lang.constant.ConstantUtils.dropLastChar;
-import static java.lang.constant.ConstantUtils.internalToBinary;
-import static java.lang.constant.ConstantUtils.validateMemberName;
-import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
+import static jdk.internal.constant.ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS;
+import static jdk.internal.constant.ConstantUtils.arrayDepth;
+import static jdk.internal.constant.ConstantUtils.binaryToInternal;
+import static jdk.internal.constant.ConstantUtils.dropFirstAndLastChar;
+import static jdk.internal.constant.ConstantUtils.internalToBinary;
+import static jdk.internal.constant.ConstantUtils.validateBinaryClassName;
+import static jdk.internal.constant.ConstantUtils.validateInternalClassName;
+import static jdk.internal.constant.ConstantUtils.validateMemberName;
 
 /**
  * A <a href="package-summary.html#nominal">nominal descriptor</a> for a
@@ -77,7 +82,7 @@ public sealed interface ClassDesc
      * @see ClassDesc#ofInternalName(String)
      */
     static ClassDesc of(String name) {
-        ConstantUtils.validateBinaryClassName(requireNonNull(name));
+        validateBinaryClassName(name);
         return ClassDesc.ofDescriptor("L" + binaryToInternal(name) + ";");
     }
 
@@ -103,7 +108,7 @@ static ClassDesc of(String name) {
      * @since 20
      */
     static ClassDesc ofInternalName(String name) {
-        ConstantUtils.validateInternalClassName(requireNonNull(name));
+        validateInternalClassName(name);
         return ClassDesc.ofDescriptor("L" + name + ";");
     }
 
@@ -122,11 +127,11 @@ static ClassDesc ofInternalName(String name) {
      * not in the correct format
      */
     static ClassDesc of(String packageName, String className) {
-        ConstantUtils.validateBinaryClassName(requireNonNull(packageName));
+        validateBinaryClassName(packageName);
         if (packageName.isEmpty()) {
             return of(className);
         }
-        validateMemberName(requireNonNull(className), false);
+        validateMemberName(className, false);
         return ofDescriptor("L" + binaryToInternal(packageName) +
                 "/" + className + ";");
     }
@@ -162,7 +167,7 @@ static ClassDesc ofDescriptor(String descriptor) {
         return (descriptor.length() == 1)
                ? Wrapper.forPrimitiveType(descriptor.charAt(0)).classDescriptor()
                // will throw IAE on descriptor.length == 0 or if array dimensions too long
-               : new ReferenceClassDescImpl(descriptor);
+               : ReferenceClassDescImpl.of(descriptor);
     }
 
     /**
@@ -175,13 +180,18 @@ static ClassDesc ofDescriptor(String descriptor) {
      * @jvms 4.4.1 The CONSTANT_Class_info Structure
      */
     default ClassDesc arrayType() {
-        int depth = ConstantUtils.arrayDepth(descriptorString());
-        if (depth >= ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS) {
+        String desc = descriptorString();
+        int depth = arrayDepth(desc);
+        if (depth >= MAX_ARRAY_TYPE_DESC_DIMENSIONS) {
             throw new IllegalStateException(
                     "Cannot create an array type descriptor with more than " +
-                    ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS + " dimensions");
+                    MAX_ARRAY_TYPE_DESC_DIMENSIONS + " dimensions");
         }
-        return arrayType(1);
+        String newDesc = "[".concat(desc);
+        if (desc.length() == 1 && desc.charAt(0) == 'V') {
+            throw new IllegalArgumentException("not a valid reference type descriptor: " + newDesc);
+        }
+        return ReferenceClassDescImpl.ofValidated(newDesc);
     }
 
     /**
@@ -196,22 +206,22 @@ default ClassDesc arrayType() {
      * @jvms 4.4.1 The CONSTANT_Class_info Structure
      */
     default ClassDesc arrayType(int rank) {
-        int netRank;
         if (rank <= 0) {
             throw new IllegalArgumentException("rank " + rank + " is not a positive value");
         }
-        try {
-            int currentDepth = ConstantUtils.arrayDepth(descriptorString());
-            netRank = Math.addExact(currentDepth, rank);
-            if (netRank > ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS) {
-                throw new IllegalArgumentException("rank: " + netRank +
-                                                   " exceeds maximum supported dimension of " +
-                                                   ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS);
-            }
-        } catch (ArithmeticException ae) {
-            throw new IllegalArgumentException("Integer overflow in rank computation");
+        String desc = descriptorString();
+        long currentDepth = arrayDepth(desc);
+        long netRank = currentDepth + rank;
+        if (netRank > MAX_ARRAY_TYPE_DESC_DIMENSIONS) {
+            throw new IllegalArgumentException("rank: " + netRank +
+                    " exceeds maximum supported dimension of " +
+                    MAX_ARRAY_TYPE_DESC_DIMENSIONS);
+        }
+        String newDesc = new StringBuilder(desc.length() + rank).repeat('[', rank).append(desc).toString();
+        if (desc.length() == 1 && desc.charAt(0) == 'V') {
+            throw new IllegalArgumentException("not a valid reference type descriptor: " + newDesc);
         }
-        return ClassDesc.ofDescriptor("[".repeat(rank) + descriptorString());
+        return ReferenceClassDescImpl.ofValidated(newDesc);
     }
 
     /**
@@ -235,7 +245,10 @@ default ClassDesc nested(String nestedName) {
         validateMemberName(nestedName, false);
         if (!isClassOrInterface())
             throw new IllegalStateException("Outer class is not a class or interface type");
-        return ClassDesc.ofDescriptor(dropLastChar(descriptorString()) + "$" + nestedName + ";");
+        String desc = descriptorString();
+        StringBuilder sb = new StringBuilder(desc.length() + nestedName.length() + 1);
+        sb.append(desc, 0, desc.length() - 1).append('$').append(nestedName).append(';');
+        return ReferenceClassDescImpl.ofValidated(sb.toString());
     }
 
     /**
@@ -255,7 +268,7 @@ default ClassDesc nested(String firstNestedName, String... moreNestedNames) {
         if (!isClassOrInterface())
             throw new IllegalStateException("Outer class is not a class or interface type");
         validateMemberName(firstNestedName, false);
-        requireNonNull(moreNestedNames);
+        // implicit null-check
         for (String addNestedNames : moreNestedNames) {
             validateMemberName(addNestedNames, false);
         }
@@ -299,7 +312,15 @@ default boolean isClassOrInterface() {
      * if this descriptor does not describe an array type
      */
     default ClassDesc componentType() {
-        return isArray() ? ClassDesc.ofDescriptor(descriptorString().substring(1)) : null;
+        if (isArray()) {
+            String desc = descriptorString();
+            if (desc.length() == 2) {
+                return Wrapper.forBasicType(desc.charAt(1)).classDescriptor();
+            } else {
+                return ReferenceClassDescImpl.ofValidated(desc.substring(1));
+            }
+        }
+        return null;
     }
 
     /**
@@ -312,9 +333,9 @@ default ClassDesc componentType() {
     default String packageName() {
         if (!isClassOrInterface())
             return "";
-        String className = internalToBinary(ConstantUtils.dropFirstAndLastChar(descriptorString()));
-        int index = className.lastIndexOf('.');
-        return (index == -1) ? "" : className.substring(0, index);
+        String desc = descriptorString();
+        int index = desc.lastIndexOf('/');
+        return (index == -1) ? "" : internalToBinary(desc.substring(1, index));
     }
 
     /**
@@ -332,11 +353,11 @@ default String displayName() {
         if (isPrimitive())
             return Wrapper.forBasicType(descriptorString().charAt(0)).primitiveSimpleName();
         else if (isClassOrInterface()) {
-            return descriptorString().substring(Math.max(1, descriptorString().lastIndexOf('/') + 1),
-                                                descriptorString().length() - 1);
+            String desc = descriptorString();
+            return desc.substring(Math.max(1, desc.lastIndexOf('/') + 1), desc.length() - 1);
         }
         else if (isArray()) {
-            int depth = ConstantUtils.arrayDepth(descriptorString());
+            int depth = arrayDepth(descriptorString());
             ClassDesc c = this;
             for (int i=0; i<depth; i++)
                 c = c.componentType();
diff --git a/src/java.base/share/classes/java/lang/constant/ConstantDescs.java b/src/java.base/share/classes/java/lang/constant/ConstantDescs.java
index a67a16643c3..0e11415f910 100644
--- a/src/java.base/share/classes/java/lang/constant/ConstantDescs.java
+++ b/src/java.base/share/classes/java/lang/constant/ConstantDescs.java
@@ -24,6 +24,9 @@
  */
 package java.lang.constant;
 
+import jdk.internal.constant.PrimitiveClassDescImpl;
+import jdk.internal.constant.ReferenceClassDescImpl;
+
 import java.lang.Enum.EnumDesc;
 import java.lang.invoke.CallSite;
 import java.lang.invoke.ConstantBootstraps;
@@ -64,115 +67,115 @@ private ConstantDescs() { }
     // Don't change the order of these declarations!
 
     /** {@link ClassDesc} representing {@link Object} */
-    public static final ClassDesc CD_Object = new ReferenceClassDescImpl("Ljava/lang/Object;");
+    public static final ClassDesc CD_Object = ReferenceClassDescImpl.ofValidated("Ljava/lang/Object;");
 
     /** {@link ClassDesc} representing {@link String} */
-    public static final ClassDesc CD_String = new ReferenceClassDescImpl("Ljava/lang/String;");
+    public static final ClassDesc CD_String = ReferenceClassDescImpl.ofValidated("Ljava/lang/String;");
 
     /** {@link ClassDesc} representing {@link Class} */
-    public static final ClassDesc CD_Class = new ReferenceClassDescImpl("Ljava/lang/Class;");
+    public static final ClassDesc CD_Class = ReferenceClassDescImpl.ofValidated("Ljava/lang/Class;");
 
     /** {@link ClassDesc} representing {@link Number} */
-    public static final ClassDesc CD_Number = new ReferenceClassDescImpl("Ljava/lang/Number;");
+    public static final ClassDesc CD_Number = ReferenceClassDescImpl.ofValidated("Ljava/lang/Number;");
 
     /** {@link ClassDesc} representing {@link Integer} */
-    public static final ClassDesc CD_Integer = new ReferenceClassDescImpl("Ljava/lang/Integer;");
+    public static final ClassDesc CD_Integer = ReferenceClassDescImpl.ofValidated("Ljava/lang/Integer;");
 
     /** {@link ClassDesc} representing {@link Long} */
-    public static final ClassDesc CD_Long = new ReferenceClassDescImpl("Ljava/lang/Long;");
+    public static final ClassDesc CD_Long = ReferenceClassDescImpl.ofValidated("Ljava/lang/Long;");
 
     /** {@link ClassDesc} representing {@link Float} */
-    public static final ClassDesc CD_Float = new ReferenceClassDescImpl("Ljava/lang/Float;");
+    public static final ClassDesc CD_Float = ReferenceClassDescImpl.ofValidated("Ljava/lang/Float;");
 
     /** {@link ClassDesc} representing {@link Double} */
-    public static final ClassDesc CD_Double = new ReferenceClassDescImpl("Ljava/lang/Double;");
+    public static final ClassDesc CD_Double = ReferenceClassDescImpl.ofValidated("Ljava/lang/Double;");
 
     /** {@link ClassDesc} representing {@link Short} */
-    public static final ClassDesc CD_Short = new ReferenceClassDescImpl("Ljava/lang/Short;");
+    public static final ClassDesc CD_Short = ReferenceClassDescImpl.ofValidated("Ljava/lang/Short;");
 
     /** {@link ClassDesc} representing {@link Byte} */
-    public static final ClassDesc CD_Byte = new ReferenceClassDescImpl("Ljava/lang/Byte;");
+    public static final ClassDesc CD_Byte = ReferenceClassDescImpl.ofValidated("Ljava/lang/Byte;");
 
     /** {@link ClassDesc} representing {@link Character} */
-    public static final ClassDesc CD_Character = new ReferenceClassDescImpl("Ljava/lang/Character;");
+    public static final ClassDesc CD_Character = ReferenceClassDescImpl.ofValidated("Ljava/lang/Character;");
 
     /** {@link ClassDesc} representing {@link Boolean} */
-    public static final ClassDesc CD_Boolean = new ReferenceClassDescImpl("Ljava/lang/Boolean;");
+    public static final ClassDesc CD_Boolean = ReferenceClassDescImpl.ofValidated("Ljava/lang/Boolean;");
 
     /** {@link ClassDesc} representing {@link Void} */
-    public static final ClassDesc CD_Void = new ReferenceClassDescImpl("Ljava/lang/Void;");
+    public static final ClassDesc CD_Void = ReferenceClassDescImpl.ofValidated("Ljava/lang/Void;");
 
     /** {@link ClassDesc} representing {@link Throwable} */
-    public static final ClassDesc CD_Throwable = new ReferenceClassDescImpl("Ljava/lang/Throwable;");
+    public static final ClassDesc CD_Throwable = ReferenceClassDescImpl.ofValidated("Ljava/lang/Throwable;");
 
     /** {@link ClassDesc} representing {@link Exception} */
-    public static final ClassDesc CD_Exception = new ReferenceClassDescImpl("Ljava/lang/Exception;");
+    public static final ClassDesc CD_Exception = ReferenceClassDescImpl.ofValidated("Ljava/lang/Exception;");
 
     /** {@link ClassDesc} representing {@link Enum} */
-    public static final ClassDesc CD_Enum = new ReferenceClassDescImpl("Ljava/lang/Enum;");
+    public static final ClassDesc CD_Enum = ReferenceClassDescImpl.ofValidated("Ljava/lang/Enum;");
 
     /** {@link ClassDesc} representing {@link VarHandle} */
-    public static final ClassDesc CD_VarHandle = new ReferenceClassDescImpl("Ljava/lang/invoke/VarHandle;");
+    public static final ClassDesc CD_VarHandle = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/VarHandle;");
 
     /** {@link ClassDesc} representing {@link MethodHandles} */
-    public static final ClassDesc CD_MethodHandles = new ReferenceClassDescImpl("Ljava/lang/invoke/MethodHandles;");
+    public static final ClassDesc CD_MethodHandles = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/MethodHandles;");
 
     /** {@link ClassDesc} representing {@link MethodHandles.Lookup} */
-    public static final ClassDesc CD_MethodHandles_Lookup = new ReferenceClassDescImpl("Ljava/lang/invoke/MethodHandles$Lookup;");
+    public static final ClassDesc CD_MethodHandles_Lookup = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/MethodHandles$Lookup;");
 
     /** {@link ClassDesc} representing {@link MethodHandle} */
-    public static final ClassDesc CD_MethodHandle = new ReferenceClassDescImpl("Ljava/lang/invoke/MethodHandle;");
+    public static final ClassDesc CD_MethodHandle = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/MethodHandle;");
 
     /** {@link ClassDesc} representing {@link MethodType} */
-    public static final ClassDesc CD_MethodType = new ReferenceClassDescImpl("Ljava/lang/invoke/MethodType;");
+    public static final ClassDesc CD_MethodType = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/MethodType;");
 
     /** {@link ClassDesc} representing {@link CallSite} */
-    public static final ClassDesc CD_CallSite = new ReferenceClassDescImpl("Ljava/lang/invoke/CallSite;");
+    public static final ClassDesc CD_CallSite = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/CallSite;");
 
     /** {@link ClassDesc} representing {@link Collection} */
-    public static final ClassDesc CD_Collection = new ReferenceClassDescImpl("Ljava/util/Collection;");
+    public static final ClassDesc CD_Collection = ReferenceClassDescImpl.ofValidated("Ljava/util/Collection;");
 
     /** {@link ClassDesc} representing {@link List} */
-    public static final ClassDesc CD_List = new ReferenceClassDescImpl("Ljava/util/List;");
+    public static final ClassDesc CD_List = ReferenceClassDescImpl.ofValidated("Ljava/util/List;");
 
     /** {@link ClassDesc} representing {@link Set} */
-    public static final ClassDesc CD_Set = new ReferenceClassDescImpl("Ljava/util/Set;");
+    public static final ClassDesc CD_Set = ReferenceClassDescImpl.ofValidated("Ljava/util/Set;");
 
     /** {@link ClassDesc} representing {@link Map} */
-    public static final ClassDesc CD_Map = new ReferenceClassDescImpl("Ljava/util/Map;");
+    public static final ClassDesc CD_Map = ReferenceClassDescImpl.ofValidated("Ljava/util/Map;");
 
     /** {@link ClassDesc} representing {@link ConstantDesc} */
-    public static final ClassDesc CD_ConstantDesc = new ReferenceClassDescImpl("Ljava/lang/constant/ConstantDesc;");
+    public static final ClassDesc CD_ConstantDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/constant/ConstantDesc;");
 
     /** {@link ClassDesc} representing {@link ClassDesc} */
-    public static final ClassDesc CD_ClassDesc = new ReferenceClassDescImpl("Ljava/lang/constant/ClassDesc;");
+    public static final ClassDesc CD_ClassDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/constant/ClassDesc;");
 
     /** {@link ClassDesc} representing {@link EnumDesc} */
-    public static final ClassDesc CD_EnumDesc = new ReferenceClassDescImpl("Ljava/lang/Enum$EnumDesc;");
+    public static final ClassDesc CD_EnumDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/Enum$EnumDesc;");
 
     /** {@link ClassDesc} representing {@link MethodTypeDesc} */
-    public static final ClassDesc CD_MethodTypeDesc = new ReferenceClassDescImpl("Ljava/lang/constant/MethodTypeDesc;");
+    public static final ClassDesc CD_MethodTypeDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/constant/MethodTypeDesc;");
 
     /** {@link ClassDesc} representing {@link MethodHandleDesc} */
-    public static final ClassDesc CD_MethodHandleDesc = new ReferenceClassDescImpl("Ljava/lang/constant/MethodHandleDesc;");
+    public static final ClassDesc CD_MethodHandleDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/constant/MethodHandleDesc;");
 
     /** {@link ClassDesc} representing {@link DirectMethodHandleDesc} */
-    public static final ClassDesc CD_DirectMethodHandleDesc = new ReferenceClassDescImpl("Ljava/lang/constant/DirectMethodHandleDesc;");
+    public static final ClassDesc CD_DirectMethodHandleDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/constant/DirectMethodHandleDesc;");
 
     /** {@link ClassDesc} representing {@link VarHandleDesc} */
-    public static final ClassDesc CD_VarHandleDesc = new ReferenceClassDescImpl("Ljava/lang/invoke/VarHandle$VarHandleDesc;");
+    public static final ClassDesc CD_VarHandleDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/VarHandle$VarHandleDesc;");
 
     /** {@link ClassDesc} representing {@link DirectMethodHandleDesc.Kind} */
-    public static final ClassDesc CD_MethodHandleDesc_Kind = new ReferenceClassDescImpl("Ljava/lang/constant/DirectMethodHandleDesc$Kind;");
+    public static final ClassDesc CD_MethodHandleDesc_Kind = ReferenceClassDescImpl.ofValidated("Ljava/lang/constant/DirectMethodHandleDesc$Kind;");
 
     /** {@link ClassDesc} representing {@link DynamicConstantDesc} */
-    public static final ClassDesc CD_DynamicConstantDesc = new ReferenceClassDescImpl("Ljava/lang/constant/DynamicConstantDesc;");
+    public static final ClassDesc CD_DynamicConstantDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/constant/DynamicConstantDesc;");
 
     /** {@link ClassDesc} representing {@link DynamicCallSiteDesc} */
-    public static final ClassDesc CD_DynamicCallSiteDesc = new ReferenceClassDescImpl("Ljava/lang/constant/DynamicCallSiteDesc;");
+    public static final ClassDesc CD_DynamicCallSiteDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/constant/DynamicCallSiteDesc;");
 
     /** {@link ClassDesc} representing {@link ConstantBootstraps} */
-    public static final ClassDesc CD_ConstantBootstraps = new ReferenceClassDescImpl("Ljava/lang/invoke/ConstantBootstraps;");
+    public static final ClassDesc CD_ConstantBootstraps = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/ConstantBootstraps;");
 
     private static final ClassDesc[] INDY_BOOTSTRAP_ARGS = {
             CD_MethodHandles_Lookup,
diff --git a/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDesc.java b/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDesc.java
index c725ccfb091..2f22bd34eda 100644
--- a/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,8 @@
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandleInfo;
-import java.util.OptionalInt;
-import java.util.stream.Stream;
 
+import jdk.internal.constant.DirectMethodHandleDescImpl;
 import jdk.internal.vm.annotation.Stable;
 
 import static java.lang.invoke.MethodHandleInfo.REF_getField;
@@ -89,7 +88,7 @@ enum Kind {
          */
         public final boolean isInterface;
         Kind(int refKind) {
-            this(refKind, false);
+            this.refKind = refKind; this.isInterface = false;
         }
 
         Kind(int refKind, boolean isInterface) { this.refKind = refKind; this.isInterface = isInterface; }
@@ -179,23 +178,6 @@ private static int tableIndex(int refKind, boolean isInterface) {
                 }
             }
         }
-
-        /**
-         * Does this {@code Kind} correspond to a virtual method invocation?
-         *
-         * @return if this {@code Kind} corresponds to a virtual method invocation
-         */
-        boolean isVirtualMethod() {
-            switch (this) {
-                case VIRTUAL:
-                case SPECIAL:
-                case INTERFACE_VIRTUAL:
-                case INTERFACE_SPECIAL:
-                    return true;
-                default:
-                    return false;
-            }
-        }
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java b/src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java
index 41a602ab4b0..0cfbcd4abf5 100644
--- a/src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,10 +32,10 @@
 import java.util.stream.Stream;
 
 import static java.lang.constant.ConstantDescs.CD_String;
-import static java.lang.constant.ConstantUtils.EMPTY_CONSTANTDESC;
-import static java.lang.constant.ConstantUtils.validateMemberName;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
+import static jdk.internal.constant.ConstantUtils.EMPTY_CONSTANTDESC;
+import static jdk.internal.constant.ConstantUtils.validateMemberName;
 
 /**
  * A <a href="package-summary.html#nominal">nominal descriptor</a> for an
diff --git a/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java b/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java
index 180841cd798..f89e3f361a1 100644
--- a/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,10 +39,10 @@
 import static java.lang.constant.ConstantDescs.CD_Class;
 import static java.lang.constant.ConstantDescs.CD_VarHandle;
 import static java.lang.constant.ConstantDescs.DEFAULT_NAME;
-import static java.lang.constant.ConstantUtils.EMPTY_CONSTANTDESC;
-import static java.lang.constant.ConstantUtils.validateMemberName;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
+import static jdk.internal.constant.ConstantUtils.EMPTY_CONSTANTDESC;
+import static jdk.internal.constant.ConstantUtils.validateMemberName;
 
 /**
  * A <a href="package-summary.html#nominal">nominal descriptor</a> for a
diff --git a/src/java.base/share/classes/java/lang/constant/MethodHandleDesc.java b/src/java.base/share/classes/java/lang/constant/MethodHandleDesc.java
index 91d6951153e..616c5b67365 100644
--- a/src/java.base/share/classes/java/lang/constant/MethodHandleDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/MethodHandleDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 
+import jdk.internal.constant.DirectMethodHandleDescImpl;
+
 import static java.lang.constant.ConstantDescs.CD_void;
 import static java.lang.constant.DirectMethodHandleDesc.Kind.CONSTRUCTOR;
 
diff --git a/src/java.base/share/classes/java/lang/constant/MethodTypeDesc.java b/src/java.base/share/classes/java/lang/constant/MethodTypeDesc.java
index ff750ccc893..19bce254d49 100644
--- a/src/java.base/share/classes/java/lang/constant/MethodTypeDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/MethodTypeDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,11 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import jdk.internal.constant.ConstantUtils;
+import jdk.internal.constant.MethodTypeDescImpl;
+
+import static java.util.Objects.requireNonNull;
+
 /**
  * A <a href="package-summary.html#nominal">nominal descriptor</a> for a
  * {@linkplain MethodType} constant.
@@ -64,7 +69,7 @@ static MethodTypeDesc ofDescriptor(String descriptor) {
      * @since 21
      */
     static MethodTypeDesc of(ClassDesc returnDesc) {
-        return MethodTypeDescImpl.ofTrusted(returnDesc, ConstantUtils.EMPTY_CLASSDESC);
+        return MethodTypeDescImpl.ofValidated(requireNonNull(returnDesc), ConstantUtils.EMPTY_CLASSDESC);
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/constant/ModuleDesc.java b/src/java.base/share/classes/java/lang/constant/ModuleDesc.java
index fe68d096f1d..b9690b7d0b3 100644
--- a/src/java.base/share/classes/java/lang/constant/ModuleDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/ModuleDesc.java
@@ -24,6 +24,9 @@
  */
 package java.lang.constant;
 
+import jdk.internal.constant.ConstantUtils;
+import jdk.internal.constant.ModuleDescImpl;
+
 import static java.util.Objects.requireNonNull;
 
 /**
diff --git a/src/java.base/share/classes/java/lang/constant/PackageDesc.java b/src/java.base/share/classes/java/lang/constant/PackageDesc.java
index 2dc20696a47..c354cafae3c 100644
--- a/src/java.base/share/classes/java/lang/constant/PackageDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/PackageDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,9 @@
  */
 package java.lang.constant;
 
+import jdk.internal.constant.ConstantUtils;
+import jdk.internal.constant.PackageDescImpl;
+
 import static java.util.Objects.requireNonNull;
 
 /**
diff --git a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
index acd3546f335..123c5897f26 100644
--- a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
+++ b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
@@ -571,6 +571,10 @@ public sealed interface MemoryLayout
      * derived from the size of the element layout of a sequence, and
      * {@code c_1}, {@code c_2}, ... {@code c_m} are other <em>static</em> offset
      * constants (such as field offsets) which are derived from the layout path.
+     * <p>
+     * For any given dynamic argument {@code x_i}, it must be that {@code 0 <= x_i < size_i},
+     * where {@code size_i} is the size of the open path element associated with {@code x_i}.
+     * Otherwise, the returned method handle throws {@link IndexOutOfBoundsException}.
      *
      * @apiNote The returned method handle can be used to compute a layout offset,
      *          similarly to {@link #byteOffset(PathElement...)}, but more flexibly, as
@@ -609,7 +613,7 @@ public sealed interface MemoryLayout
      * offset {@code O} of the access operation is computed as follows:
      *
      * {@snippet lang = "java":
-     * O = this.offsetHandle(P).invokeExact(B, I1, I2, ... In);
+     * O = this.byteOffsetHandle(P).invokeExact(B, I1, I2, ... In);
      * }
      * <p>
      * Accessing a memory segment using the var handle returned by this method is subject
@@ -627,6 +631,9 @@ public sealed interface MemoryLayout
      *     {@code O + A <= S}, where {@code O} is the accessed offset (computed as above),
      *     {@code A} is the size of the selected layout and {@code S} is the size of the
      *     accessed memory segment.</li>
+     *     <li>If the provided layout path has an open path element whose size is {@code S},
+     *     its corresponding trailing {@code long} coordinate value {@code I} must be
+     *     {@code 0 <= I < S}, or an {@link IndexOutOfBoundsException} is thrown.</li>
      *     <li>The accessed memory segment must be
      *     {@link MemorySegment#isAccessibleBy(Thread) accessible} from the thread
      *     performing the access operation, or a {@link WrongThreadException} is thrown.</li>
@@ -728,14 +735,43 @@ public sealed interface MemoryLayout
      * offset {@code O} of the access operation is computed as follows:
      *
      * {@snippet lang = "java":
-     * O = this.offsetHandle(P).invokeExact(this.scale(B, I0), I1, I2, ... In);
+     * O = this.byteOffsetHandle(P).invokeExact(this.scale(B, I0), I1, I2, ... In);
      * }
      * <p>
-     * More formally, this method can be obtained from the {@link #varHandle(PathElement...)},
+     * More formally, the method handle returned by this method is obtained from {@link #varHandle(PathElement...)},
      * as follows:
      * {@snippet lang = "java":
      * MethodHandles.collectCoordinates(varHandle(elements), 1, scaleHandle())
      * }
+     * <p>
+     * Accessing a memory segment using the var handle returned by this method is subject
+     * to the following checks:
+     * <ul>
+     *     <li>The physical address of the accessed memory segment must be
+     *     <a href="MemorySegment.html#segment-alignment">aligned</a> according to the
+     *     {@linkplain #byteAlignment() alignment constraint} of the root layout
+     *     (this layout), or an {@link IllegalArgumentException} is thrown. Note
+     *     that the alignment constraint of the root layout can be more strict
+     *     (but not less) than the alignment constraint of the selected value layout.</li>
+     *     <li>The offset of the access operation (computed as above) must fall inside
+     *     the spatial bounds of the accessed memory segment, or an
+     *     {@link IndexOutOfBoundsException} is thrown. This is the case when
+     *     {@code O + A <= S}, where {@code O} is the accessed offset (computed as above),
+     *     {@code A} is the size of the selected layout and {@code S} is the size of the
+     *     accessed memory segment.</li>
+     *     <li>If the provided layout path has an open path element whose size is {@code S},
+     *     its corresponding trailing {@code long} coordinate value {@code I} must be
+     *     {@code 0 <= I < S}, or an {@link IndexOutOfBoundsException} is thrown.</li>
+     *     <li>The accessed memory segment must be
+     *     {@link MemorySegment#isAccessibleBy(Thread) accessible} from the thread
+     *     performing the access operation, or a {@link WrongThreadException} is thrown.</li>
+     *     <li>For write operations, the accessed memory segment must not be
+     *     {@link MemorySegment#isReadOnly() read only}, or an
+     *     {@link IllegalArgumentException} is thrown.</li>
+     *     <li>The {@linkplain MemorySegment#scope() scope} associated with the accessed
+     *     segment must be {@linkplain MemorySegment.Scope#isAlive() alive}, or an
+     *     {@link IllegalStateException} is thrown.</li>
+     * </ul>
      *
      * @apiNote
      * As the leading index coordinate {@code I0} is not bound by any sequence layout, it
@@ -792,6 +828,9 @@ public sealed interface MemoryLayout
      *     {@code O + A <= S}, where {@code O} is the start offset of
      *     the slicing operation (computed as above), {@code A} is the size of the
      *     selected layout and {@code S} is the size of the accessed memory segment.</li>
+     *     <li>If the provided layout path has an open path element whose size is {@code S},
+     *     its corresponding trailing {@code long} coordinate value {@code I} must be
+     *     {@code 0 <= I < S}, or an {@link IndexOutOfBoundsException} is thrown.</li>
      * </ul>
      *
      * @apiNote The returned method handle can be used to obtain a memory segment slice,
@@ -838,7 +877,8 @@ public sealed interface MemoryLayout
      *     layout as its target layout.</li>
      * </ul>
      * Sequence path elements selecting more than one sequence element layout are called
-     * <a href="MemoryLayout.html#open-path-elements">open path elements</a>.
+     * <a href="MemoryLayout.html#open-path-elements">open path elements</a>. The <em>size</em>
+     * of an open path element determines the number of element layouts that can be selected by it.
      *
      * @implSpec
      * Implementations of this interface are immutable, thread-safe and
@@ -906,6 +946,7 @@ static PathElement sequenceElement(long index) {
          *    <li>if {@code F > 0}, then {@code B = ceilDiv(C - S, F)}</li>
          *    <li>if {@code F < 0}, then {@code B = ceilDiv(-(S + 1), -F)}</li>
          * </ul>
+         * That is, the size of the returned open path element is {@code B}.
          *
          * @param start the index of the first sequence element to be selected
          * @param step the step factor at which subsequence sequence elements are to be
@@ -924,7 +965,7 @@ static PathElement sequenceElement(long start, long step) {
          * <p>
          * The exact sequence element selected by this layout is expressed as an index
          * {@code I}. If {@code C} is the sequence element count, it follows that
-         * {@code 0 <= I < C}.
+         * {@code 0 <= I < C}. That is, {@code C} is the size of the returned open path element.
          */
         static PathElement sequenceElement() {
             return LayoutPath.SequenceElement.instance();
diff --git a/src/java.base/share/classes/java/net/DatagramSocketImpl.java b/src/java.base/share/classes/java/net/DatagramSocketImpl.java
index c0b282bab56..54093a9d5f1 100644
--- a/src/java.base/share/classes/java/net/DatagramSocketImpl.java
+++ b/src/java.base/share/classes/java/net/DatagramSocketImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -171,7 +171,7 @@ protected void disconnect() {
      * the time-to-live option.
      * @see #getTTL()
      */
-    @Deprecated
+    @Deprecated(forRemoval = true, since = "1.2")
     protected abstract void setTTL(byte ttl) throws IOException;
 
     /**
@@ -183,7 +183,7 @@ protected void disconnect() {
      * @return a byte representing the TTL value
      * @see #setTTL(byte)
      */
-    @Deprecated
+    @Deprecated(forRemoval = true, since = "1.2")
     protected abstract byte getTTL() throws IOException;
 
     /**
diff --git a/src/java.base/share/classes/java/net/MulticastSocket.java b/src/java.base/share/classes/java/net/MulticastSocket.java
index 8103aade5ca..9a9d57118c0 100644
--- a/src/java.base/share/classes/java/net/MulticastSocket.java
+++ b/src/java.base/share/classes/java/net/MulticastSocket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -226,7 +226,7 @@ public MulticastSocket(SocketAddress bindaddr) throws IOException {
      *             <b>int</b> instead of <b>byte</b> as the type for ttl.
      * @see #getTTL()
      */
-    @Deprecated
+    @Deprecated(forRemoval = true, since = "1.2")
     public void setTTL(byte ttl) throws IOException {
         delegate().setTTL(ttl);
     }
@@ -271,7 +271,7 @@ public void setTimeToLive(int ttl) throws IOException {
      * which returns an <b>int</b> instead of a <b>byte</b>.
      * @see #setTTL(byte)
      */
-    @Deprecated
+    @Deprecated(forRemoval = true, since = "1.2")
     public byte getTTL() throws IOException {
         return delegate().getTTL();
     }
@@ -561,7 +561,7 @@ public boolean getLoopbackMode() throws SocketException {
      * @see SecurityManager#checkMulticast(java.net.InetAddress, byte)
      * @see SecurityManager#checkConnect
      */
-    @Deprecated
+    @Deprecated(forRemoval = true, since = "1.4")
     public void send(DatagramPacket p, byte ttl)
         throws IOException {
         delegate().send(p, ttl);
diff --git a/src/java.base/share/classes/java/net/NetMulticastSocket.java b/src/java.base/share/classes/java/net/NetMulticastSocket.java
index 4160156997a..e7aed881fee 100644
--- a/src/java.base/share/classes/java/net/NetMulticastSocket.java
+++ b/src/java.base/share/classes/java/net/NetMulticastSocket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -650,8 +650,8 @@ public Set<SocketOption<?>> supportedOptions() {
      */
     private InetAddress infAddress = null;
 
-    @Deprecated
     @Override
+    @SuppressWarnings("removal")
     public void setTTL(byte ttl) throws IOException {
         if (isClosed())
             throw new SocketException("Socket is closed");
@@ -668,8 +668,8 @@ public void setTimeToLive(int ttl) throws IOException {
         getImpl().setTimeToLive(ttl);
     }
 
-    @Deprecated
     @Override
+    @SuppressWarnings("removal")
     public byte getTTL() throws IOException {
         if (isClosed())
             throw new SocketException("Socket is closed");
@@ -884,7 +884,6 @@ public boolean getLoopbackMode() throws SocketException {
     }
 
     @SuppressWarnings("removal")
-    @Deprecated
     @Override
     public void send(DatagramPacket p, byte ttl)
             throws IOException {
diff --git a/src/java.base/share/classes/java/net/SocketOptions.java b/src/java.base/share/classes/java/net/SocketOptions.java
index 340530d8cef..f534e0287d7 100644
--- a/src/java.base/share/classes/java/net/SocketOptions.java
+++ b/src/java.base/share/classes/java/net/SocketOptions.java
@@ -190,6 +190,13 @@ public interface SocketOptions {
 
     /**
      * See {@link StandardSocketOptions#SO_LINGER} for description of this socket option.
+     * <p>
+     * Set the value to {@code Boolean.FALSE} or an integer less than {@code 0} with
+     * {@link #setOption(int, Object)} to disable this option. An integer greater than or equal to
+     * {@code 0} will enable the option and will represent the linger interval.
+     * <p>
+     * If this option is enabled then {@link #getOption(int)} will return an integer value
+     * representing the linger interval, else the return value will be {@code Boolean.FALSE}.
      *
      * @see Socket#setSoLinger
      * @see Socket#getSoLinger
diff --git a/src/java.base/share/classes/java/security/SecureRandom.java b/src/java.base/share/classes/java/security/SecureRandom.java
index 6a1683e993c..4242b5da04a 100644
--- a/src/java.base/share/classes/java/security/SecureRandom.java
+++ b/src/java.base/share/classes/java/security/SecureRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 
 package java.security;
 
-import jdk.internal.util.random.RandomSupport.RandomGeneratorProperties;
 import sun.security.jca.GetInstance;
 import sun.security.jca.GetInstance.Instance;
 import sun.security.jca.Providers;
@@ -149,10 +148,6 @@
  * @since 1.1
  */
 
-@RandomGeneratorProperties(
-        name = "SecureRandom",
-        isStochastic = true
-)
 public class SecureRandom extends java.util.Random {
 
     private static final Debug pdebug =
diff --git a/src/java.base/share/classes/java/time/Instant.java b/src/java.base/share/classes/java/time/Instant.java
index 37dd9f8d2ac..05358cc4f3c 100644
--- a/src/java.base/share/classes/java/time/Instant.java
+++ b/src/java.base/share/classes/java/time/Instant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1162,6 +1162,30 @@ public long until(Temporal endExclusive, TemporalUnit unit) {
         return unit.between(this, end);
     }
 
+    /**
+     * Calculates the {@code Duration} until another {@code Instant}.
+     * <p>
+     * The start and end points are {@code this} and the specified instant.
+     * The result will be negative if the end is before the start. Calling
+     * this method is equivalent to
+     * {@link Duration#between(Temporal, Temporal) Duration.between(this,
+     * endExclusive)}.
+     * <p>
+     * This instance is immutable and unaffected by this method call.
+     *
+     * @param endExclusive the end {@code Instant}, exclusive, not null
+     * @return the {@code Duration} from this {@code Instant} until the
+     *      specified {@code endExclusive} {@code Instant}
+     * @see Duration#between(Temporal, Temporal)
+     * @since 23
+     */
+    public Duration until(Instant endExclusive) {
+        Objects.requireNonNull(endExclusive, "endExclusive");
+        long secsDiff = Math.subtractExact(endExclusive.seconds, seconds);
+        int nanosDiff = endExclusive.nanos - nanos;
+        return Duration.ofSeconds(secsDiff, nanosDiff);
+    }
+
     private long nanosUntil(Instant end) {
         long secsDiff = Math.subtractExact(end.seconds, seconds);
         long totalNanos = Math.multiplyExact(secsDiff, NANOS_PER_SECOND);
diff --git a/src/java.base/share/classes/java/util/Random.java b/src/java.base/share/classes/java/util/Random.java
index b1163db0b18..661a29e303b 100644
--- a/src/java.base/share/classes/java/util/Random.java
+++ b/src/java.base/share/classes/java/util/Random.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,6 @@
 import java.util.stream.IntStream;
 import java.util.stream.LongStream;
 
-import jdk.internal.util.random.RandomSupport.*;
-
 import static jdk.internal.util.random.RandomSupport.*;
 
 import jdk.internal.misc.Unsafe;
@@ -77,11 +75,6 @@
  * @author  Frank Yellin
  * @since   1.0
  */
-@RandomGeneratorProperties(
-        name = "Random",
-        i = 48, j = 0, k = 0,
-        equidistribution = 0
-)
 public class Random implements RandomGenerator, java.io.Serializable {
 
     /**
diff --git a/src/java.base/share/classes/java/util/SplittableRandom.java b/src/java.base/share/classes/java/util/SplittableRandom.java
index 4242322d687..cb1801f5680 100644
--- a/src/java.base/share/classes/java/util/SplittableRandom.java
+++ b/src/java.base/share/classes/java/util/SplittableRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import java.util.stream.Stream;
 import jdk.internal.util.random.RandomSupport;
 import jdk.internal.util.random.RandomSupport.AbstractSplittableGenerator;
-import jdk.internal.util.random.RandomSupport.RandomGeneratorProperties;
 
 /**
  * A generator of uniform pseudorandom values (with period 2<sup>64</sup>)
@@ -87,11 +86,6 @@
  * @author  Doug Lea
  * @since   1.8
  */
-@RandomGeneratorProperties(
-        name = "SplittableRandom",
-        i = 64, j = 0, k = 0,
-        equidistribution = 1
-)
 public final class SplittableRandom implements RandomGenerator, SplittableGenerator {
 
     /*
diff --git a/src/java.base/share/classes/java/util/concurrent/CancellationException.java b/src/java.base/share/classes/java/util/concurrent/CancellationException.java
index bd351730421..c211464f26d 100644
--- a/src/java.base/share/classes/java/util/concurrent/CancellationException.java
+++ b/src/java.base/share/classes/java/util/concurrent/CancellationException.java
@@ -60,4 +60,16 @@ public CancellationException() {}
     public CancellationException(String message) {
         super(message);
     }
+
+    /**
+     * Only intended for in-package usage.
+     * Constructs a {@code CancellationException} with the specified detail
+     * message and CancellationException cause.
+     *
+     * @param message the detail message
+     * @param cause the underlying cancellation exception
+     */
+    CancellationException(String message, CancellationException cause) {
+        super(message, cause);
+    }
 }
diff --git a/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java b/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
index a664365fe29..94d46e8c662 100644
--- a/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
+++ b/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
@@ -380,7 +380,7 @@ final boolean completeRelay(Object r) {
     /**
      * Reports result using Future.get conventions.
      */
-    private static Object reportGet(Object r)
+    private static Object reportGet(Object r, String details)
         throws InterruptedException, ExecutionException {
         if (r == null) // by convention below, null means interrupted
             throw new InterruptedException();
@@ -389,7 +389,7 @@ private static Object reportGet(Object r)
             if ((x = ((AltResult)r).ex) == null)
                 return null;
             if (x instanceof CancellationException)
-                throw (CancellationException)x;
+                throw new CancellationException(details, (CancellationException)x);
             if ((x instanceof CompletionException) &&
                 (cause = x.getCause()) != null)
                 x = cause;
@@ -401,13 +401,13 @@ private static Object reportGet(Object r)
     /**
      * Decodes outcome to return result or throw unchecked exception.
      */
-    private static Object reportJoin(Object r) {
+    private static Object reportJoin(Object r, String details) {
         if (r instanceof AltResult) {
             Throwable x;
             if ((x = ((AltResult)r).ex) == null)
                 return null;
             if (x instanceof CancellationException)
-                throw (CancellationException)x;
+                throw new CancellationException(details, (CancellationException)x);
             if (x instanceof CompletionException)
                 throw (CompletionException)x;
             throw new CompletionException(x);
@@ -2070,7 +2070,7 @@ public T get() throws InterruptedException, ExecutionException {
         Object r;
         if ((r = result) == null)
             r = waitingGet(true);
-        return (T) reportGet(r);
+        return (T) reportGet(r, "get");
     }
 
     /**
@@ -2093,7 +2093,7 @@ public T get(long timeout, TimeUnit unit)
         Object r;
         if ((r = result) == null)
             r = timedGet(nanos);
-        return (T) reportGet(r);
+        return (T) reportGet(r, "get");
     }
 
     /**
@@ -2115,7 +2115,7 @@ public T join() {
         Object r;
         if ((r = result) == null)
             r = waitingGet(false);
-        return (T) reportJoin(r);
+        return (T) reportJoin(r, "join");
     }
 
     /**
@@ -2131,7 +2131,7 @@ public T join() {
     @SuppressWarnings("unchecked")
     public T getNow(T valueIfAbsent) {
         Object r;
-        return ((r = result) == null) ? valueIfAbsent : (T) reportJoin(r);
+        return ((r = result) == null) ? valueIfAbsent : (T) reportJoin(r, "getNow");
     }
 
     @Override
diff --git a/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java b/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java
index 32f7840ef04..6d6d9efad03 100644
--- a/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java
+++ b/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java
@@ -194,6 +194,8 @@ else if (p.cmpExItem(m, e) != m)
                     if ((m = s.await(e, ns, this,  // spin if (nearly) empty
                                      p == null || p.waiter == null)) == e)
                         unspliceLifo(s);           // cancelled
+                    else if (m != null)
+                        s.selfLinkItem();
                     break;
                 }
             }
diff --git a/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java b/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
index dd1ea70195b..baa4c0e4f73 100644
--- a/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
+++ b/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
@@ -85,12 +85,6 @@
  * @since 1.7
  * @author Doug Lea
  */
-
-@RandomGeneratorProperties(
-        name = "ThreadLocalRandom",
-        i = 64, j = 0, k = 0,
-        equidistribution = 1
-)
 public final class ThreadLocalRandom extends Random {
     /*
      * This class implements the java.util.Random API (and subclasses
diff --git a/src/java.base/share/classes/java/util/random/RandomGeneratorFactory.java b/src/java.base/share/classes/java/util/random/RandomGeneratorFactory.java
index a7c06371368..030f7f70a0a 100644
--- a/src/java.base/share/classes/java/util/random/RandomGeneratorFactory.java
+++ b/src/java.base/share/classes/java/util/random/RandomGeneratorFactory.java
@@ -25,24 +25,30 @@
 
 package java.util.random;
 
-import java.lang.reflect.Constructor;
+import jdk.internal.random.L128X1024MixRandom;
+import jdk.internal.random.L128X128MixRandom;
+import jdk.internal.random.L128X256MixRandom;
+import jdk.internal.random.L32X64MixRandom;
+import jdk.internal.random.L64X1024MixRandom;
+import jdk.internal.random.L64X128MixRandom;
+import jdk.internal.random.L64X128StarStarRandom;
+import jdk.internal.random.L64X256MixRandom;
+import jdk.internal.random.Xoroshiro128PlusPlus;
+import jdk.internal.random.Xoshiro256PlusPlus;
+
 import java.math.BigInteger;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
+import java.security.SecureRandom;
 import java.util.Objects;
-import java.util.function.Function;
 import java.util.Map;
+import java.util.Random;
+import java.util.SplittableRandom;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.random.RandomGenerator.ArbitrarilyJumpableGenerator;
 import java.util.random.RandomGenerator.JumpableGenerator;
 import java.util.random.RandomGenerator.LeapableGenerator;
 import java.util.random.RandomGenerator.SplittableGenerator;
 import java.util.random.RandomGenerator.StreamableGenerator;
-import java.util.ServiceLoader;
-import java.util.ServiceLoader.Provider;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import jdk.internal.util.random.RandomSupport.RandomGeneratorProperties;
 
 /**
  * This is a factory class for generating multiple random number generators
@@ -107,137 +113,268 @@
  *
  */
 public final class RandomGeneratorFactory<T extends RandomGenerator> {
-    /**
-     * Instance provider class of random number algorithm.
-     */
-    private final Provider<? extends RandomGenerator> provider;
 
-    /**
-     * Provider RandomGeneratorProperties annotation.
-     */
-    private volatile RandomGeneratorProperties properties;
+    private static final String DEFAULT_ALGORITHM = "L32X64MixRandom";
 
-    /**
-     * Default provider constructor.
-     */
-    private volatile Constructor<T> ctor;
+    private record RandomGeneratorProperties(
+            Class<? extends RandomGenerator> rgClass,
+            String name,
+            String group,
+            int i,
+            int j,
+            int k,
+            int equidistribution,
+            int flags) {
 
-    /**
-     * Provider constructor with long seed.
-     */
-    private Constructor<T> ctorLong;
-
-    /**
-     * Provider constructor with byte[] seed.
-     */
-    private Constructor<T> ctorBytes;
+        /* single bit masks composable with operator | */
+        private static final int INSTANTIABLE       = 1 << 0;
+        private static final int LONG_SEED          = 1 << 1;
+        private static final int BYTE_ARRAY_SEED    = 1 << 2;
+        private static final int STOCHASTIC         = 1 << 3;
+        private static final int HARDWARE           = 1 << 4;
+        private static final int DEPRECATED         = 1 << 5;
 
+        private static final int ALL_CONSTRUCTORS = INSTANTIABLE | LONG_SEED | BYTE_ARRAY_SEED;
 
-    private static class FactoryMapHolder {
-        static final Map<String, Provider<? extends RandomGenerator>> FACTORY_MAP = createFactoryMap();
+        private static final Map<String, RandomGeneratorProperties> FACTORY_MAP = createFactoryMap();
 
         /**
-         * Returns the factory map, lazily constructing map on first use.
+         * Returns the factory map, lazily constructing it on first use.
+         * <p> Although {@link ThreadLocalRandom} can only be accessed via
+         * {@link ThreadLocalRandom#current()}, a map entry is added nevertheless
+         * to record its properties that are otherwise not documented
+         * anywhere else.
+         * <p> Currently, no algorithm is deprecated.
          *
-         * @return Map of RandomGeneratorFactory classes.
+         * @return Map of RandomGeneratorProperties.
          */
-        private static Map<String, Provider<? extends RandomGenerator>> createFactoryMap() {
-            FactoryMapHolder.class.getModule().addUses(RandomGenerator.class);
-            return ServiceLoader
-                .load(RandomGenerator.class, ClassLoader.getPlatformClassLoader())
-                .stream()
-                .filter(p -> !p.type().isInterface())
-                .collect(Collectors.toMap(p -> p.type().getSimpleName(), Function.identity()));
+        private static Map<String, RandomGeneratorProperties> createFactoryMap() {
+            return Map.ofEntries(
+                    entry(SecureRandom.class, "SecureRandom", "Legacy",
+                            0, 0, 0, Integer.MAX_VALUE,
+                            INSTANTIABLE | BYTE_ARRAY_SEED | STOCHASTIC | deprecationBit(SecureRandom.class)),
+                    entry(Random.class, "Random", "Legacy",
+                            48, 0, 0, 0,
+                            INSTANTIABLE | LONG_SEED | deprecationBit(Random.class)),
+                    entry(SplittableRandom.class, "SplittableRandom", "Legacy",
+                            64, 0, 0, 1,
+                            INSTANTIABLE | LONG_SEED | deprecationBit(SplittableRandom.class)),
+                    entry(L32X64MixRandom.class, "L32X64MixRandom", "LXM",
+                            64, 1, 32, 1,
+                            ALL_CONSTRUCTORS),
+                    entry(L64X128MixRandom.class, "L64X128MixRandom", "LXM",
+                            128, 1, 64, 2,
+                            ALL_CONSTRUCTORS),
+                    entry(L64X128StarStarRandom.class, "L64X128StarStarRandom", "LXM",
+                            128, 1, 64, 2,
+                            ALL_CONSTRUCTORS),
+                    entry(L64X256MixRandom.class, "L64X256MixRandom", "LXM",
+                            256, 1, 64, 4,
+                            ALL_CONSTRUCTORS),
+                    entry(L64X1024MixRandom.class, "L64X1024MixRandom", "LXM",
+                            1024, 1, 64, 16,
+                            ALL_CONSTRUCTORS),
+                    entry(L128X128MixRandom.class, "L128X128MixRandom", "LXM",
+                            128, 1, 128, 1,
+                            ALL_CONSTRUCTORS),
+                    entry(L128X256MixRandom.class, "L128X256MixRandom", "LXM",
+                            256, 1, 128, 1,
+                            ALL_CONSTRUCTORS),
+                    entry(L128X1024MixRandom.class, "L128X1024MixRandom", "LXM",
+                            1024, 1, 128, 1,
+                            ALL_CONSTRUCTORS),
+                    entry(Xoroshiro128PlusPlus.class, "Xoroshiro128PlusPlus", "Xoroshiro",
+                            128, 1, 0, 1,
+                            ALL_CONSTRUCTORS),
+                    entry(Xoshiro256PlusPlus.class, "Xoshiro256PlusPlus", "Xoshiro",
+                            256, 1, 0, 3,
+                            ALL_CONSTRUCTORS),
+                    entry(ThreadLocalRandom.class, "ThreadLocalRandom", "Legacy",
+                            64, 0, 0, 1,
+                            deprecationBit(ThreadLocalRandom.class))
+            );
+        }
+
+        private static Map.Entry<String, RandomGeneratorProperties> entry(
+                Class<? extends RandomGenerator> rgClass, String name, String group,
+                int i, int j, int k, int equidistribution,
+                int flags) {
+            return Map.entry(name,
+                    new RandomGeneratorProperties(rgClass, name, group,
+                            i, j, k, equidistribution,
+                            flags));
+        }
+
+        private static int deprecationBit(Class<? extends RandomGenerator> rgClass) {
+            return rgClass.isAnnotationPresent(Deprecated.class) ? DEPRECATED : 0;
+        }
+
+        private RandomGenerator create() {
+            return switch (name) {
+                case "Random" ->                new Random();
+                case "SecureRandom" ->          new SecureRandom();
+                case "SplittableRandom" ->      new SplittableRandom();
+                case "L32X64MixRandom" ->       new L32X64MixRandom();
+                case "L64X128MixRandom" ->      new L64X128MixRandom();
+                case "L64X128StarStarRandom" -> new L64X128StarStarRandom();
+                case "L64X256MixRandom" ->      new L64X256MixRandom();
+                case "L64X1024MixRandom" ->     new L64X1024MixRandom();
+                case "L128X128MixRandom" ->     new L128X128MixRandom();
+                case "L128X256MixRandom" ->     new L128X256MixRandom();
+                case "L128X1024MixRandom" ->    new L128X1024MixRandom();
+                case "Xoroshiro128PlusPlus" ->  new Xoroshiro128PlusPlus();
+                case "Xoshiro256PlusPlus" ->    new Xoshiro256PlusPlus();
+                default -> throw new InternalError("should not happen");
+            };
+        }
+
+        private RandomGenerator create(long seed) {
+            if (isInstantiable() && (flags & LONG_SEED) == 0) {
+                throw new UnsupportedOperationException("Random algorithm "
+                        + name + " does not support a long seed");
+            }
+            return switch (name) {
+                case "Random" ->                new Random(seed);
+                case "SplittableRandom" ->      new SplittableRandom(seed);
+                case "L32X64MixRandom" ->       new L32X64MixRandom(seed);
+                case "L64X128MixRandom" ->      new L64X128MixRandom(seed);
+                case "L64X128StarStarRandom" -> new L64X128StarStarRandom(seed);
+                case "L64X256MixRandom" ->      new L64X256MixRandom(seed);
+                case "L64X1024MixRandom" ->     new L64X1024MixRandom(seed);
+                case "L128X128MixRandom" ->     new L128X128MixRandom(seed);
+                case "L128X256MixRandom" ->     new L128X256MixRandom(seed);
+                case "L128X1024MixRandom" ->    new L128X1024MixRandom(seed);
+                case "Xoroshiro128PlusPlus" ->  new Xoroshiro128PlusPlus(seed);
+                case "Xoshiro256PlusPlus" ->    new Xoshiro256PlusPlus(seed);
+                default -> throw new InternalError("should not happen");
+            };
+        }
+
+        private RandomGenerator create(byte[] seed) {
+            if (isInstantiable() && (flags & BYTE_ARRAY_SEED) == 0) {
+                throw new UnsupportedOperationException("Random algorithm "
+                        + name + " does not support a byte[] seed");
+            }
+            return switch (name) {
+                case "SecureRandom" ->          new SecureRandom(seed);
+                case "L32X64MixRandom" ->       new L32X64MixRandom(seed);
+                case "L64X128MixRandom" ->      new L64X128MixRandom(seed);
+                case "L64X128StarStarRandom" -> new L64X128StarStarRandom(seed);
+                case "L64X256MixRandom" ->      new L64X256MixRandom(seed);
+                case "L64X1024MixRandom" ->     new L64X1024MixRandom(seed);
+                case "L128X128MixRandom" ->     new L128X128MixRandom(seed);
+                case "L128X256MixRandom" ->     new L128X256MixRandom(seed);
+                case "L128X1024MixRandom" ->    new L128X1024MixRandom(seed);
+                case "Xoroshiro128PlusPlus" ->  new Xoroshiro128PlusPlus(seed);
+                case "Xoshiro256PlusPlus" ->    new Xoshiro256PlusPlus(seed);
+                default -> throw new InternalError("should not happen");
+            };
+        }
+
+        private boolean isStochastic() {
+            return (flags & STOCHASTIC) != 0;
+        }
+
+        private boolean isHardware() {
+            return (flags & HARDWARE) != 0;
+        }
+
+        private boolean isInstantiable() {
+            return (flags & INSTANTIABLE) != 0;
+        }
+
+        private boolean isDeprecated() {
+            return (flags & DEPRECATED) != 0;
+        }
+
+        private BigInteger period() {
+            /*
+             * 0                if i = j = k = 0
+             * (2^i - j) 2^k    otherwise
+             */
+            return i == 0 && j == 0 && k == 0
+                    ? BigInteger.ZERO
+                    : BigInteger.ONE.shiftLeft(i).subtract(BigInteger.valueOf(j)).shiftLeft(k);
+        }
+
+        private int stateBits() {
+            return i == 0 && k == 0 ? Integer.MAX_VALUE : i + k;
         }
     }
 
     /**
-     * Private constructor.
-     *
-     * @param provider  Provider class to wrap.
+     * Random generator properties.
      */
-    private RandomGeneratorFactory(Provider<? extends RandomGenerator> provider) {
-        this.provider = provider;
-    }
+    private final RandomGeneratorProperties properties;
 
     /**
-     * Returns the factory map, lazily constructing map on first call.
+     * Private constructor.
      *
-     * @return Map of RandomGeneratorFactory classes.
+     * @param properties Random generator properties.
      */
-    private static Map<String, Provider<? extends RandomGenerator>> getFactoryMap() {
-        return FactoryMapHolder.FACTORY_MAP;
+    private RandomGeneratorFactory(RandomGeneratorProperties properties) {
+        this.properties = properties;
     }
 
     /**
-     * Return the annotation for the specified provider.
+     * Returns the factory map, lazily constructing the map on first call.
      *
-     * @return RandomGeneratorProperties annotation for the specified provider.
+     * @return Map of random generator classes.
      */
-     private RandomGeneratorProperties getProperties() {
-        if (properties == null) {
-            synchronized (provider) {
-                if (properties == null) {
-                    properties = provider.type().getDeclaredAnnotation(RandomGeneratorProperties.class);
-                    Objects.requireNonNull(properties, provider.type() + " missing annotation");
-                }
-            }
-        }
-
-        return properties;
+    private static Map<String, RandomGeneratorProperties> getFactoryMap() {
+        return RandomGeneratorProperties.FACTORY_MAP;
     }
 
     /**
-     * Return true if the provider is a subclass of the category.
+     * Return true if the random generator class is a subclass of the category.
      *
      * @param category Interface category, sub-interface of {@link RandomGenerator}.
      *
-     * @return true if the provider is a subclass of the category.
+     * @return true if the random generator class is a subclass of the category.
      */
     private boolean isSubclass(Class<? extends RandomGenerator> category) {
-        return isSubclass(category, provider);
+        return isSubclass(category, properties.rgClass());
     }
 
     /**
-     * Return true if the provider is a subclass of the category.
+     * Return true if rgClass is a subclass of the category.
      *
      * @param category Interface category, sub-interface of {@link RandomGenerator}.
-     * @param provider Provider that is being filtered.
+     * @param rgClass Class that is being filtered.
      *
-     * @return true if the provider is a subclass of the category.
+     * @return true if rgClass is a subclass of the category.
      */
     private static boolean isSubclass(Class<? extends RandomGenerator> category,
-                                      Provider<? extends RandomGenerator> provider) {
-        return provider != null && category.isAssignableFrom(provider.type());
+            Class<? extends RandomGenerator> rgClass) {
+        return rgClass != null && category.isAssignableFrom(rgClass);
     }
 
     /**
-     * Returns the provider matching name and category.
-     *
-     * @param name      Name of RandomGenerator
-     * @param category  Interface category, sub-interface of {@link RandomGenerator}.
+     * Returns a RandomGeneratorProperties instance matching name and category.
      *
-     * @return A provider matching name and category.
-     *
-     * @throws IllegalArgumentException if provider is not a subclass of category.
-     */
-    private static Provider<? extends RandomGenerator> findProvider(String name,
-                                                                    Class<? extends RandomGenerator> category)
-            throws IllegalArgumentException {
-        Map<String, Provider<? extends RandomGenerator>> fm = getFactoryMap();
-        Provider<? extends RandomGenerator> provider = fm.get(name);
-        if (provider == null) {
+     * @param name     Name of RandomGenerator
+     * @param category Interface category, sub-interface of {@link RandomGenerator}.
+     * @return A RandomGeneratorProperties instance matching name and category.
+     * @throws IllegalArgumentException if the resulting type is not a subclass of category.
+     */
+    private static RandomGeneratorProperties findClass(String name,
+            Class<? extends RandomGenerator> category) throws IllegalArgumentException {
+        RandomGeneratorProperties properties = name != null
+                ? getFactoryMap().get(name)
+                : null;
+        if (properties == null || !properties.isInstantiable()) {
             throw new IllegalArgumentException("No implementation of the random number generator algorithm \"" +
-                                                name +
-                                                "\" is available");
-        } else if (!isSubclass(category, provider)) {
+                    name +
+                    "\" is available");
+        }
+        if (!isSubclass(category, properties.rgClass())) {
             throw new IllegalArgumentException("The random number generator algorithm \"" +
-                                                name +
-                                                "\" is not implemented with the interface \"" +
-                                                category.getSimpleName() +
-                                                "\"");
+                    name +
+                    "\" is not implemented with the interface \"" +
+                    category.getSimpleName() +
+                    "\"");
         }
-        return provider;
+        return properties;
     }
 
     /**
@@ -255,8 +392,8 @@ private static Provider<? extends RandomGenerator> findProvider(String name,
     static <T extends RandomGenerator> T of(String name, Class<T> category)
             throws IllegalArgumentException {
         @SuppressWarnings("unchecked")
-        T uncheckedRandomGenerator = (T)findProvider(name, category).get();
-        return uncheckedRandomGenerator;
+        T instance = (T) findClass(name, category).create();
+        return instance;
     }
 
     /**
@@ -273,68 +410,7 @@ static <T extends RandomGenerator> T of(String name, Class<T> category)
      */
     static <T extends RandomGenerator> RandomGeneratorFactory<T> factoryOf(String name, Class<T> category)
             throws IllegalArgumentException {
-        Provider<? extends RandomGenerator> uncheckedProvider = findProvider(name, category);
-        return new RandomGeneratorFactory<>(uncheckedProvider);
-    }
-
-    /**
-     * Fetch the required constructors for class of random number algorithm.
-     *
-     * @param randomGeneratorClass class of random number algorithm (provider)
-     */
-    private void getConstructors(Class<? extends RandomGenerator> randomGeneratorClass) {
-        if (ctor == null) {
-            synchronized (provider) {
-                if (ctor == null) {
-                    PrivilegedExceptionAction<Constructor<?>[]> ctorAction = randomGeneratorClass::getConstructors;
-                    try {
-                        @SuppressWarnings("removal")
-                        Constructor<?>[] ctors = AccessController.doPrivileged(ctorAction);
-
-                        Constructor<T> tmpCtor = null;
-                        Constructor<T> tmpCtorLong = null;
-                        Constructor<T> tmpCtorBytes = null;
-
-
-                        for (Constructor<?> ctorGeneric : ctors) {
-                            @SuppressWarnings("unchecked")
-                            Constructor<T> ctorSpecific = (Constructor<T>) ctorGeneric;
-                            final Class<?>[] parameterTypes = ctorSpecific.getParameterTypes();
-
-                            if (parameterTypes.length == 0) {
-                                tmpCtor = ctorSpecific;
-                            } else if (parameterTypes.length == 1) {
-                                Class<?> argType = parameterTypes[0];
-
-                                if (argType == long.class) {
-                                    tmpCtorLong = ctorSpecific;
-                                } else if (argType == byte[].class) {
-                                    tmpCtorBytes = ctorSpecific;
-                                }
-                            }
-                        }
-
-                        if (tmpCtor == null) {
-                            throw new IllegalStateException("Random algorithm " + name() + " is missing a default constructor");
-                        }
-
-                        // Store specialized constructors first, guarded by ctor
-                        ctorBytes = tmpCtorBytes;
-                        ctorLong = tmpCtorLong;
-                        ctor = tmpCtor;
-                    } catch (PrivilegedActionException ex) {
-                        // Do nothing
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Ensure all the required constructors are fetched.
-     */
-    private void ensureConstructors() {
-        getConstructors(provider.type());
+        return new RandomGeneratorFactory<>(findClass(name, category));
     }
 
     /**
@@ -355,7 +431,7 @@ public static <T extends RandomGenerator> RandomGeneratorFactory<T> of(String na
         Objects.requireNonNull(name);
         @SuppressWarnings("unchecked")
         RandomGeneratorFactory<T> factory =
-                (RandomGeneratorFactory<T>)factoryOf(name, RandomGenerator.class);
+                (RandomGeneratorFactory<T>) factoryOf(name, RandomGenerator.class);
         return factory;
     }
 
@@ -369,23 +445,21 @@ public static <T extends RandomGenerator> RandomGeneratorFactory<T> of(String na
      * @return a {@link RandomGeneratorFactory}
      */
     public static RandomGeneratorFactory<RandomGenerator> getDefault() {
-        return factoryOf("L32X64MixRandom", RandomGenerator.class);
+        return factoryOf(DEFAULT_ALGORITHM, RandomGenerator.class);
     }
 
     /**
      * Returns a non-empty stream of available {@link RandomGeneratorFactory RandomGeneratorFactory(s)}.
-     * <p>
+     *
      * RandomGenerators that are marked as deprecated are not included in the result.
      *
      * @return a non-empty stream of all available {@link RandomGeneratorFactory RandomGeneratorFactory(s)}.
      */
     public static Stream<RandomGeneratorFactory<RandomGenerator>> all() {
-        Map<String, Provider<? extends RandomGenerator>> fm = getFactoryMap();
-        return fm.values()
-                 .stream()
-                 .filter(p -> !p.type().isAnnotationPresent(Deprecated.class) &&
-                              p.type().isAnnotationPresent(RandomGeneratorProperties.class))
-                 .map(RandomGeneratorFactory::new);
+        return getFactoryMap().values()
+                .stream()
+                .filter(p -> p.isInstantiable() && !p.isDeprecated())
+                .map(RandomGeneratorFactory::new);
     }
 
     /**
@@ -395,7 +469,7 @@ public static Stream<RandomGeneratorFactory<RandomGenerator>> all() {
      * @return Name of the <a href="package-summary.html#algorithms">algorithm</a>.
      */
     public String name() {
-        return provider.type().getSimpleName();
+        return properties.name();
     }
 
     /**
@@ -405,7 +479,7 @@ public String name() {
      * @return Group name of the <a href="package-summary.html#algorithms">algorithm</a>.
      */
     public String group() {
-        return getProperties().group();
+        return properties.group();
     }
 
     /**
@@ -416,11 +490,7 @@ public String group() {
      *         to maintain state of seed.
      */
     public int stateBits() {
-        RandomGeneratorProperties properties = getProperties();
-        int i = properties.i();
-        int k = properties.k();
-
-        return i == 0 && k == 0 ? Integer.MAX_VALUE : i + k;
+        return properties.stateBits();
     }
 
     /**
@@ -429,7 +499,7 @@ public int stateBits() {
      * @return the equidistribution of the <a href="package-summary.html#algorithms">algorithm</a>.
      */
     public int equidistribution() {
-        return getProperties().equidistribution();
+        return properties.equidistribution();
     }
 
     /**
@@ -440,16 +510,7 @@ public int equidistribution() {
      * @return BigInteger period.
      */
     public BigInteger period() {
-        RandomGeneratorProperties properties = getProperties();
-        int i = properties.i();
-        int j = properties.j();
-        int k = properties.k();
-
-        if (i == 0 && j == 0 && k == 0) {
-            return BigInteger.ZERO;
-        } else {
-            return BigInteger.ONE.shiftLeft(i).subtract(BigInteger.valueOf(j)).shiftLeft(k);
-        }
+        return properties.period();
     }
 
     /**
@@ -460,7 +521,7 @@ public BigInteger period() {
      * @return true if random generator is statistical.
      */
     public boolean isStatistical() {
-        return !getProperties().isStochastic();
+        return !properties.isStochastic();
     }
 
     /**
@@ -470,7 +531,7 @@ public boolean isStatistical() {
      * @return true if random generator is stochastic.
      */
     public boolean isStochastic() {
-        return getProperties().isStochastic();
+        return properties.isStochastic();
     }
 
     /**
@@ -480,7 +541,7 @@ public boolean isStochastic() {
      * @return true if random generator is generated by hardware.
      */
     public boolean isHardware() {
-        return getProperties().isHardware();
+        return properties.isHardware();
     }
 
     /**
@@ -547,66 +608,64 @@ public boolean isStreamable() {
      *         marked for deprecation
      */
      public boolean isDeprecated() {
-        return provider.type().isAnnotationPresent(Deprecated.class);
+        return properties.isDeprecated();
      }
 
     /**
-     * Create an instance of {@link RandomGenerator} based on
+     * Create an instance of {@link RandomGenerator} based on the
      * <a href="package-summary.html#algorithms">algorithm</a> chosen.
      *
-     * @return new in instance of {@link RandomGenerator}.
-     *
+     * @return new instance of {@link RandomGenerator}.
      */
     public T create() {
-        try {
-            ensureConstructors();
-            return ctor.newInstance();
-        } catch (Exception ex) {
-            // Should never happen.
-            throw new IllegalStateException("Random algorithm " + name() + " is missing a default constructor", ex);
-        }
+        @SuppressWarnings("unchecked")
+        T instance = (T) properties.create();
+        return instance;
     }
 
     /**
-     * Create an instance of {@link RandomGenerator} based on
-     * <a href="package-summary.html#algorithms">algorithm</a> chosen
-     * providing a starting long seed. If long seed is not supported by an
-     * algorithm then the no argument form of create is used.
+     * Create an instance of {@link RandomGenerator} based on the
+     * <a href="package-summary.html#algorithms">algorithm</a> chosen,
+     * and the provided {@code seed}.
+     * If the {@link RandomGenerator} doesn't support instantiation through
+     * a {@code seed} of type {@code long} then this method throws
+     * an {@link UnsupportedOperationException}.
      *
      * @param seed long random seed value.
      *
-     * @return new in instance of {@link RandomGenerator}.
+     * @return new instance of {@link RandomGenerator}.
+     *
+     * @throws UnsupportedOperationException
+     *      if a {@code seed} of type {@code long} in not supported.
      */
     public T create(long seed) {
-        try {
-            ensureConstructors();
-            return ctorLong.newInstance(seed);
-        } catch (Exception ex) {
-            return create();
-        }
+        @SuppressWarnings("unchecked")
+        T instance = (T) properties.create(seed);
+        return instance;
     }
 
     /**
-     * Create an instance of {@link RandomGenerator} based on
-     * <a href="package-summary.html#algorithms">algorithm</a> chosen
-     * providing a starting byte[] seed. If byte[] seed is not supported by an
-     * <a href="package-summary.html#algorithms">algorithm</a> then the no
-     * argument form of create is used.
+     * Create an instance of {@link RandomGenerator} based on the
+     * <a href="package-summary.html#algorithms">algorithm</a> chosen,
+     * and the provided {@code seed}.
+     * If the {@link RandomGenerator} doesn't support instantiation through
+     * a {@code seed} of type {@code byte[]} then this method throws
+     * an {@link UnsupportedOperationException}.
      *
      * @param seed byte array random seed value.
      *
-     * @return new in instance of {@link RandomGenerator}.
+     * @return new instance of {@link RandomGenerator}.
+     *
+     * @throws UnsupportedOperationException
+     *      if a {@code seed} of type {@code byte[]} in not supported.
      *
      * @throws NullPointerException if seed is null.
      */
     public T create(byte[] seed) {
         Objects.requireNonNull(seed, "seed must not be null");
-        try {
-            ensureConstructors();
-            return ctorBytes.newInstance(seed);
-        } catch (Exception ex) {
-            return create();
-        }
+        @SuppressWarnings("unchecked")
+        T instance = (T) properties.create(seed);
+        return instance;
     }
 
 }
diff --git a/src/java.base/share/classes/java/util/random/package-info.java b/src/java.base/share/classes/java/util/random/package-info.java
index 2e16b319f44..9f9df0ff395 100644
--- a/src/java.base/share/classes/java/util/random/package-info.java
+++ b/src/java.base/share/classes/java/util/random/package-info.java
@@ -81,8 +81,8 @@
  * <blockquote>{@code import java.util.random.*;}</blockquote>
  *
  * Then one can choose a specific implementation by giving the name of a generator
- * algorithm to the static method {@link RandomGenerator#of}, in which case the
- * no-arguments constructor for that implementation is used:
+ * algorithm to the static method {@link RandomGenerator#of}, in which case
+ * a {@link RandomGenerator} is constructed without any seed value:
  *
  * <blockquote>{@code RandomGenerator g = RandomGenerator.of("L64X128MixRandom");}</blockquote>
  *
@@ -125,8 +125,8 @@
  *
  * <h2>Choosing a Random Number Generator Algorithm</h2>
  *
- * <p> There are three groups of random number generator algorithm provided
- * in Java: the Legacy group, the LXM group, and the Xoroshiro/Xoshiro group.
+ * <p> Random number generator algorithms are organized in groups,
+ * as described {@linkplain java.util.random##algorithms below}.
  *
  * <p> The legacy group includes random number generators that existed
  * before JDK 17: Random, ThreadLocalRandom, SplittableRandom, and
@@ -304,6 +304,13 @@
  *      <td style="text-align:right">1</td>
  *  </tr>
  *  <tr>
+ *      <th scope="row" style="text-align:left">SecureRandom</th>
+ *      <td style="text-align:left">Legacy</td>
+ *      <td style="text-align:left">BigInteger.ZERO</td>
+ *      <td style="text-align:right">Integer.MAX_VALUE</td>
+ *      <td style="text-align:right">Integer.MAX_VALUE</td>
+ *  </tr>
+ *  <tr>
  *      <th scope="row" style="text-align:left">ThreadLocalRandom <sup>*</sup></th>
  *      <td style="text-align:left">Legacy</td>
  *      <td style="text-align:left">BigInteger.ONE.shiftLeft(64)</td>
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufWriterImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufWriterImpl.java
index 779bb0393b4..87161588203 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufWriterImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -171,9 +171,8 @@ public int size() {
         return offset;
     }
 
-    @Override
     public ByteBuffer asByteBuffer() {
-        return ByteBuffer.wrap(elems, 0, offset);
+        return ByteBuffer.wrap(elems, 0, offset).slice();
     }
 
     @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 394f7cc807a..4eba39989f6 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -221,6 +221,9 @@ private int adjustForObjectOrUninitialized(int bci) {
     }
 
     private void inflateLabel(int bci) {
+        if (bci < 0 || bci > codeLength)
+            throw new IllegalArgumentException(String.format("Bytecode offset out of range; bci=%d, codeLength=%d",
+                                                             bci, codeLength));
         if (labels[bci] == null)
             labels[bci] = new LabelImpl(this, bci);
     }
@@ -237,6 +240,10 @@ private void inflateLineNumbers() {
                 int pEnd = p + (nLn * 4);
                 for (; p < pEnd; p += 4) {
                     int startPc = classReader.readU2(p);
+                    if (startPc > codeLength) {
+                        throw new IllegalArgumentException(String.format(
+                                "Line number start_pc out of range; start_pc=%d, codeLength=%d", startPc, codeLength));
+                    }
                     int lineNumber = classReader.readU2(p + 2);
                     lineNumbers[startPc] = lineNumber;
                 }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/StackCounter.java b/src/java.base/share/classes/jdk/internal/classfile/impl/StackCounter.java
index 0b52d4e1ea5..84b0425893d 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/StackCounter.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/StackCounter.java
@@ -51,7 +51,7 @@ static StackCounter of(DirectCodeBuilder dcb, BufWriterImpl buf) {
                 dcb.methodInfo.methodName().stringValue(),
                 dcb.methodInfo.methodTypeSymbol(),
                 (dcb.methodInfo.methodFlags() & ACC_STATIC) != 0,
-                dcb.bytecodesBufWriter.asByteBuffer().slice(0, dcb.bytecodesBufWriter.size()),
+                ((BufWriterImpl) dcb.bytecodesBufWriter).asByteBuffer(),
                 dcb.constantPool,
                 dcb.handlers);
     }
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 81e6f341a13..17fcc5046a1 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
@@ -151,7 +151,7 @@ static StackMapGenerator of(DirectCodeBuilder dcb, BufWriterImpl buf) {
                 dcb.methodInfo.methodName().stringValue(),
                 dcb.methodInfo.methodTypeSymbol(),
                 (dcb.methodInfo.methodFlags() & ACC_STATIC) != 0,
-                dcb.bytecodesBufWriter.asByteBuffer().slice(0, dcb.bytecodesBufWriter.size()),
+                ((BufWriterImpl) dcb.bytecodesBufWriter).asByteBuffer(),
                 dcb.constantPool,
                 dcb.context,
                 dcb.handlers);
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java
index d5b724ff684..8dfa726ec19 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -285,7 +285,6 @@ void verify_method(VerificationWrapper.MethodWrapper m, List<VerifyError> errors
         } catch (VerifyError err) {
             errorsCollector.add(err);
         } catch (Error | Exception e) {
-            e.printStackTrace();
             errorsCollector.add(new VerifyError(e.toString()));
         }
     }
diff --git a/src/java.base/share/classes/java/lang/constant/ConstantUtils.java b/src/java.base/share/classes/jdk/internal/constant/ConstantUtils.java
similarity index 84%
rename from src/java.base/share/classes/java/lang/constant/ConstantUtils.java
rename to src/java.base/share/classes/jdk/internal/constant/ConstantUtils.java
index d8a1ccd543b..8d761f4f04e 100644
--- a/src/java.base/share/classes/java/lang/constant/ConstantUtils.java
+++ b/src/java.base/share/classes/jdk/internal/constant/ConstantUtils.java
@@ -22,28 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.constant;
+package jdk.internal.constant;
 
 import sun.invoke.util.Wrapper;
 
+import java.lang.constant.ClassDesc;
+import java.lang.constant.ConstantDesc;
+import java.lang.constant.ConstantDescs;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import static java.util.Objects.requireNonNull;
-
 /**
  * Helper methods for the implementation of {@code java.lang.constant}.
  */
-class ConstantUtils {
+public final class ConstantUtils {
     /** an empty constant descriptor */
     public static final ConstantDesc[] EMPTY_CONSTANTDESC = new ConstantDesc[0];
-    static final ClassDesc[] EMPTY_CLASSDESC = new ClassDesc[0];
-    static final Constable[] EMPTY_CONSTABLE = new Constable[0];
-    static final int MAX_ARRAY_TYPE_DESC_DIMENSIONS = 255;
+    public static final ClassDesc[] EMPTY_CLASSDESC = new ClassDesc[0];
+    public static final int MAX_ARRAY_TYPE_DESC_DIMENSIONS = 255;
 
     private static final Set<String> pointyNames = Set.of(ConstantDescs.INIT_NAME, ConstantDescs.CLASS_INIT_NAME);
 
+    /** No instantiation */
+    private ConstantUtils() {}
+
     /**
      * Validates the correctness of a binary class name. In particular checks for the presence of
      * invalid characters in the name.
@@ -51,9 +54,10 @@ class ConstantUtils {
      * @param name the class name
      * @return the class name passed if valid
      * @throws IllegalArgumentException if the class name is invalid
+     * @throws NullPointerException if class name is {@code null}
      */
-    static String validateBinaryClassName(String name) {
-        for (int i=0; i<name.length(); i++) {
+    public static String validateBinaryClassName(String name) {
+        for (int i = 0; i < name.length(); i++) {
             char ch = name.charAt(i);
             if (ch == ';' || ch == '[' || ch == '/')
                 throw new IllegalArgumentException("Invalid class name: " + name);
@@ -62,21 +66,22 @@ static String validateBinaryClassName(String name) {
     }
 
     /**
-      * Validates the correctness of an internal class name.
-      * In particular checks for the presence of invalid characters in the name.
-      *
-      * @param name the class name
-      * @return the class name passed if valid
-      * @throws IllegalArgumentException if the class name is invalid
-      */
-     static String validateInternalClassName(String name) {
-         for (int i=0; i<name.length(); i++) {
-             char ch = name.charAt(i);
-             if (ch == ';' || ch == '[' || ch == '.')
-                 throw new IllegalArgumentException("Invalid class name: " + name);
-         }
-         return name;
-     }
+     * Validates the correctness of an internal class name.
+     * In particular checks for the presence of invalid characters in the name.
+     *
+     * @param name the class name
+     * @return the class name passed if valid
+     * @throws IllegalArgumentException if the class name is invalid
+     * @throws NullPointerException if class name is {@code null}
+     */
+    public static String validateInternalClassName(String name) {
+        for (int i = 0; i < name.length(); i++) {
+            char ch = name.charAt(i);
+            if (ch == ';' || ch == '[' || ch == '.')
+                throw new IllegalArgumentException("Invalid class name: " + name);
+        }
+        return name;
+    }
 
     /**
      * Validates the correctness of a binary package name.
@@ -89,7 +94,7 @@ static String validateInternalClassName(String name) {
      * @throws NullPointerException if the package name is {@code null}
      */
     public static String validateBinaryPackageName(String name) {
-        for (int i=0; i<name.length(); i++) {
+        for (int i = 0; i < name.length(); i++) {
             char ch = name.charAt(i);
             if (ch == ';' || ch == '[' || ch == '/')
                 throw new IllegalArgumentException("Invalid package name: " + name);
@@ -108,7 +113,7 @@ public static String validateBinaryPackageName(String name) {
      * @throws NullPointerException if the package name is {@code null}
      */
     public static String validateInternalPackageName(String name) {
-        for (int i=0; i<name.length(); i++) {
+        for (int i = 0; i < name.length(); i++) {
             char ch = name.charAt(i);
             if (ch == ';' || ch == '[' || ch == '.')
                 throw new IllegalArgumentException("Invalid package name: " + name);
@@ -129,7 +134,7 @@ public static String validateInternalPackageName(String name) {
      * @throws NullPointerException if the module name is {@code null}
      */
     public static String validateModuleName(String name) {
-        for (int i=name.length() - 1; i >= 0; i--) {
+        for (int i = name.length() - 1; i >= 0; i--) {
             char ch = name.charAt(i);
             if ((ch >= '\u0000' && ch <= '\u001F')
             || ((ch == '\\' || ch == ':' || ch =='@') && (i == 0 || name.charAt(--i) != '\\')))
@@ -144,11 +149,13 @@ public static String validateModuleName(String name) {
      * @param name the name of the member
      * @return the name passed if valid
      * @throws IllegalArgumentException if the member name is invalid
+     * @throws NullPointerException if the member name is {@code null}
      */
     public static String validateMemberName(String name, boolean method) {
-        if (name.length() == 0)
+        int len = name.length();
+        if (len == 0)
             throw new IllegalArgumentException("zero-length member name");
-        for (int i=0; i<name.length(); i++) {
+        for (int i = 0; i < len; i++) {
             char ch = name.charAt(i);
             if (ch == '.' || ch == ';' || ch == '[' || ch == '/')
                 throw new IllegalArgumentException("Invalid member name: " + name);
@@ -160,31 +167,27 @@ public static String validateMemberName(String name, boolean method) {
         return name;
     }
 
-    static void validateClassOrInterface(ClassDesc classDesc) {
+    public static void validateClassOrInterface(ClassDesc classDesc) {
         if (!classDesc.isClassOrInterface())
             throw new IllegalArgumentException("not a class or interface type: " + classDesc);
     }
 
-    static int arrayDepth(String descriptorString) {
+    public static int arrayDepth(String descriptorString) {
         int depth = 0;
         while (descriptorString.charAt(depth) == '[')
             depth++;
         return depth;
     }
 
-    static String binaryToInternal(String name) {
+    public static String binaryToInternal(String name) {
         return name.replace('.', '/');
     }
 
-    static String internalToBinary(String name) {
+    public static String internalToBinary(String name) {
         return name.replace('/', '.');
     }
 
-    static String dropLastChar(String s) {
-        return s.substring(0, s.length() - 1);
-    }
-
-    static String dropFirstAndLastChar(String s) {
+    public static String dropFirstAndLastChar(String s) {
         return s.substring(1, s.length() - 1);
     }
 
@@ -196,7 +199,7 @@ static String dropFirstAndLastChar(String s) {
      * @return the list of types
      * @throws IllegalArgumentException if the descriptor string is not valid
      */
-    static List<ClassDesc> parseMethodDescriptor(String descriptor) {
+    public static List<ClassDesc> parseMethodDescriptor(String descriptor) {
         int cur = 0, end = descriptor.length();
         ArrayList<ClassDesc> ptypes = new ArrayList<>();
         ptypes.add(null); // placeholder for return type
@@ -227,7 +230,8 @@ private static ClassDesc resolveClassDesc(String descriptor, int start, int len)
         if (len == 1) {
             return Wrapper.forPrimitiveType(descriptor.charAt(start)).classDescriptor();
         }
-        return ClassDesc.ofDescriptor(descriptor.substring(start, start + len));
+        // Pre-verified in parseMethodDescriptor; avoid redundant verification
+        return ReferenceClassDescImpl.ofValidated(descriptor.substring(start, start + len));
     }
 
     private static final char JVM_SIGNATURE_ARRAY = '[';
diff --git a/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDescImpl.java b/src/java.base/share/classes/jdk/internal/constant/DirectMethodHandleDescImpl.java
similarity index 91%
rename from src/java.base/share/classes/java/lang/constant/DirectMethodHandleDescImpl.java
rename to src/java.base/share/classes/jdk/internal/constant/DirectMethodHandleDescImpl.java
index 47aa3dc36d2..0097ed6b0c2 100644
--- a/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDescImpl.java
+++ b/src/java.base/share/classes/jdk/internal/constant/DirectMethodHandleDescImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,25 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.constant;
+package jdk.internal.constant;
 
+import java.lang.constant.ClassDesc;
+import java.lang.constant.DirectMethodHandleDesc;
+import java.lang.constant.MethodTypeDesc;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.util.Objects;
 
 import static java.lang.constant.ConstantDescs.CD_void;
-import static java.lang.constant.ConstantUtils.validateClassOrInterface;
-import static java.lang.constant.ConstantUtils.validateMemberName;
 import static java.lang.constant.DirectMethodHandleDesc.Kind.CONSTRUCTOR;
 import static java.util.Objects.requireNonNull;
+import static jdk.internal.constant.ConstantUtils.validateClassOrInterface;
+import static jdk.internal.constant.ConstantUtils.validateMemberName;
 
 /**
  * A <a href="package-summary.html#nominal">nominal descriptor</a> for a direct
  * {@link MethodHandle}.  A {@linkplain DirectMethodHandleDescImpl} corresponds to
  * a {@code Constant_MethodHandle_info} entry in the constant pool of a classfile.
  */
-final class DirectMethodHandleDescImpl implements DirectMethodHandleDesc {
+public final class DirectMethodHandleDescImpl implements DirectMethodHandleDesc {
 
     private final Kind kind;
     private final ClassDesc owner;
@@ -62,7 +65,7 @@ final class DirectMethodHandleDescImpl implements DirectMethodHandleDesc {
      * is not {@code void}
      * @jvms 4.2.2 Unqualified Names
      */
-    DirectMethodHandleDescImpl(Kind kind, ClassDesc owner, String name, MethodTypeDesc type) {
+    public DirectMethodHandleDescImpl(Kind kind, ClassDesc owner, String name, MethodTypeDesc type) {
         if (kind == CONSTRUCTOR)
             name = "<init>";
 
@@ -82,12 +85,11 @@ final class DirectMethodHandleDescImpl implements DirectMethodHandleDesc {
         this.kind = kind;
         this.owner = owner;
         this.name = name;
-        if (kind.isVirtualMethod())
-            this.invocationType = type.insertParameterTypes(0, owner);
-        else if (kind == CONSTRUCTOR)
-            this.invocationType = type.changeReturnType(owner);
-        else
-            this.invocationType = type;
+        this.invocationType = switch (kind) {
+            case VIRTUAL, SPECIAL, INTERFACE_VIRTUAL, INTERFACE_SPECIAL -> type.insertParameterTypes(0, owner);
+            case CONSTRUCTOR -> type.changeReturnType(owner);
+            default -> type;
+        };
     }
 
     private static void validateFieldType(MethodTypeDesc type, boolean isSetter, boolean isVirtual) {
diff --git a/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java b/src/java.base/share/classes/jdk/internal/constant/MethodTypeDescImpl.java
similarity index 80%
rename from src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java
rename to src/java.base/share/classes/jdk/internal/constant/MethodTypeDescImpl.java
index 7ee0995439a..d6d622b419c 100644
--- a/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java
+++ b/src/java.base/share/classes/jdk/internal/constant/MethodTypeDescImpl.java
@@ -22,10 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.constant;
+package jdk.internal.constant;
 
 import jdk.internal.vm.annotation.Stable;
 
+import java.lang.constant.ClassDesc;
+import java.lang.constant.MethodTypeDesc;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.security.AccessController;
@@ -41,7 +43,7 @@
  * {@link MethodType}.  A {@linkplain MethodTypeDescImpl} corresponds to a
  * {@code Constant_MethodType_info} entry in the constant pool of a classfile.
  */
-final class MethodTypeDescImpl implements MethodTypeDesc {
+public final class MethodTypeDescImpl implements MethodTypeDesc {
     private final ClassDesc returnType;
     private final @Stable ClassDesc[] argTypes;
     private @Stable String cachedDescriptorString;
@@ -65,15 +67,31 @@ private MethodTypeDescImpl(ClassDesc returnType, ClassDesc[] validatedArgTypes)
      * @param returnType a {@link ClassDesc} describing the return type
      * @param trustedArgTypes {@link ClassDesc}s describing the trusted parameter types
      */
-    static MethodTypeDescImpl ofTrusted(ClassDesc returnType, ClassDesc[] trustedArgTypes) {
+    public static MethodTypeDescImpl ofTrusted(ClassDesc returnType, ClassDesc[] trustedArgTypes) {
         requireNonNull(returnType);
-        if (trustedArgTypes.length == 0) // implicit null check
-            return new MethodTypeDescImpl(returnType, ConstantUtils.EMPTY_CLASSDESC);
+        // implicit null checks of trustedArgTypes and all elements
+        for (ClassDesc cd : trustedArgTypes) {
+            validateArgument(cd);
+        }
+        return ofValidated(returnType, trustedArgTypes);
+    }
 
-        for (ClassDesc cd : trustedArgTypes)
-            if (cd.descriptorString().charAt(0) == 'V') // implicit null check
-                throw new IllegalArgumentException("Void parameters not permitted");
+    private static ClassDesc validateArgument(ClassDesc arg) {
+        if (arg.descriptorString().charAt(0) == 'V') // implicit null check
+            throw new IllegalArgumentException("Void parameters not permitted");
+        return arg;
+    }
 
+    /**
+     * Constructs a {@linkplain MethodTypeDesc} with the specified pre-validated return type
+     * and a pre-validated trusted parameter types array.
+     *
+     * @param returnType a {@link ClassDesc} describing the return type
+     * @param trustedArgTypes {@link ClassDesc}s describing the trusted parameter types
+     */
+    public static MethodTypeDescImpl ofValidated(ClassDesc returnType, ClassDesc[] trustedArgTypes) {
+        if (trustedArgTypes.length == 0)
+            return new MethodTypeDescImpl(returnType, ConstantUtils.EMPTY_CLASSDESC);
         return new MethodTypeDescImpl(returnType, trustedArgTypes);
     }
 
@@ -86,7 +104,7 @@ static MethodTypeDescImpl ofTrusted(ClassDesc returnType, ClassDesc[] trustedArg
      * method descriptor
      * @jvms 4.3.3 Method Descriptors
      */
-    static MethodTypeDescImpl ofDescriptor(String descriptor) {
+    public static MethodTypeDescImpl ofDescriptor(String descriptor) {
         // Implicit null-check of descriptor
         List<ClassDesc> ptypes = ConstantUtils.parseMethodDescriptor(descriptor);
         int args = ptypes.size() - 1;
@@ -94,7 +112,7 @@ static MethodTypeDescImpl ofDescriptor(String descriptor) {
                 ? ptypes.subList(1, args + 1).toArray(ConstantUtils.EMPTY_CLASSDESC)
                 : ConstantUtils.EMPTY_CLASSDESC;
 
-        MethodTypeDescImpl result = ofTrusted(ptypes.get(0), paramTypes);
+        MethodTypeDescImpl result = ofValidated(ptypes.get(0), paramTypes);
         result.cachedDescriptorString = descriptor;
         return result;
     }
@@ -127,14 +145,14 @@ public ClassDesc[] parameterArray() {
 
     @Override
     public MethodTypeDesc changeReturnType(ClassDesc returnType) {
-        return new MethodTypeDescImpl(requireNonNull(returnType), argTypes);
+        return ofValidated(requireNonNull(returnType), argTypes);
     }
 
     @Override
     public MethodTypeDesc changeParameterType(int index, ClassDesc paramType) {
         ClassDesc[] newArgs = argTypes.clone();
-        newArgs[index] = paramType;
-        return ofTrusted(returnType, newArgs);
+        newArgs[index] = validateArgument(paramType);
+        return ofValidated(returnType, newArgs);
     }
 
     @Override
@@ -149,7 +167,7 @@ public MethodTypeDesc dropParameterTypes(int start, int end) {
         if (end < argTypes.length) {
             System.arraycopy(argTypes, end, newArgs, start, argTypes.length - end);
         }
-        return ofTrusted(returnType, newArgs);
+        return ofValidated(returnType, newArgs);
     }
 
     @Override
@@ -162,10 +180,16 @@ public MethodTypeDesc insertParameterTypes(int pos, ClassDesc... paramTypes) {
             System.arraycopy(argTypes, 0, newArgs, 0, pos);
         }
         System.arraycopy(paramTypes, 0, newArgs, pos, paramTypes.length);
+        int destPos = pos + paramTypes.length;
         if (pos < argTypes.length) {
-            System.arraycopy(argTypes, pos, newArgs, pos + paramTypes.length, argTypes.length - pos);
+            System.arraycopy(argTypes, pos, newArgs, destPos, argTypes.length - pos);
+        }
+        // Validate after copying to avoid TOCTOU
+        for (int i = pos; i < destPos; i++) {
+            validateArgument(newArgs[i]);
         }
-        return ofTrusted(returnType, newArgs);
+
+        return ofValidated(returnType, newArgs);
     }
 
     @Override
diff --git a/src/java.base/share/classes/java/lang/constant/ModuleDescImpl.java b/src/java.base/share/classes/jdk/internal/constant/ModuleDescImpl.java
similarity index 86%
rename from src/java.base/share/classes/java/lang/constant/ModuleDescImpl.java
rename to src/java.base/share/classes/jdk/internal/constant/ModuleDescImpl.java
index 0a01f5b2b73..89310c1331c 100644
--- a/src/java.base/share/classes/java/lang/constant/ModuleDescImpl.java
+++ b/src/java.base/share/classes/jdk/internal/constant/ModuleDescImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.constant;
+package jdk.internal.constant;
+
+import java.lang.constant.ModuleDesc;
 
 /*
  * Implementation of {@code ModuleDesc}
  * @param name must have been validated
  */
-record ModuleDescImpl(String name) implements ModuleDesc {
+public record ModuleDescImpl(String name) implements ModuleDesc {
 
     @Override
     public String toString() {
diff --git a/src/java.base/share/classes/java/lang/constant/PackageDescImpl.java b/src/java.base/share/classes/jdk/internal/constant/PackageDescImpl.java
similarity index 85%
rename from src/java.base/share/classes/java/lang/constant/PackageDescImpl.java
rename to src/java.base/share/classes/jdk/internal/constant/PackageDescImpl.java
index 1f0077007b8..3ef65b4e4ea 100644
--- a/src/java.base/share/classes/java/lang/constant/PackageDescImpl.java
+++ b/src/java.base/share/classes/jdk/internal/constant/PackageDescImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.constant;
+package jdk.internal.constant;
+
+import java.lang.constant.PackageDesc;
 
 /*
  * Implementation of {@code PackageDesc}
  * @param internalName must have been validated
  */
-record PackageDescImpl(String internalName) implements PackageDesc {
+public record PackageDescImpl(String internalName) implements PackageDesc {
 
     @Override
     public String toString() {
diff --git a/src/java.base/share/classes/java/lang/constant/PrimitiveClassDescImpl.java b/src/java.base/share/classes/jdk/internal/constant/PrimitiveClassDescImpl.java
similarity index 88%
rename from src/java.base/share/classes/java/lang/constant/PrimitiveClassDescImpl.java
rename to src/java.base/share/classes/jdk/internal/constant/PrimitiveClassDescImpl.java
index 0478fbe3bba..123c76a1e9f 100644
--- a/src/java.base/share/classes/java/lang/constant/PrimitiveClassDescImpl.java
+++ b/src/java.base/share/classes/jdk/internal/constant/PrimitiveClassDescImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.constant;
+package jdk.internal.constant;
 
+import java.lang.constant.ClassDesc;
+import java.lang.constant.ConstantDescs;
+import java.lang.constant.DynamicConstantDesc;
 import java.lang.invoke.MethodHandles;
 
 import sun.invoke.util.Wrapper;
@@ -34,7 +37,7 @@
  * A <a href="package-summary.html#nominal">nominal descriptor</a> for the class
  * constant corresponding to a primitive type (e.g., {@code int.class}).
  */
-final class PrimitiveClassDescImpl
+public final class PrimitiveClassDescImpl
         extends DynamicConstantDesc<Class<?>> implements ClassDesc {
 
     private final String descriptor;
@@ -49,7 +52,7 @@ final class PrimitiveClassDescImpl
      * describe a valid primitive type
      * @jvms 4.3 Descriptors
      */
-    PrimitiveClassDescImpl(String descriptor) {
+    public PrimitiveClassDescImpl(String descriptor) {
         super(ConstantDescs.BSM_PRIMITIVE_CLASS, requireNonNull(descriptor), ConstantDescs.CD_Class);
         if (descriptor.length() != 1
             || "VIJCSBFDZ".indexOf(descriptor.charAt(0)) < 0)
diff --git a/src/java.base/share/classes/java/lang/constant/ReferenceClassDescImpl.java b/src/java.base/share/classes/jdk/internal/constant/ReferenceClassDescImpl.java
similarity index 83%
rename from src/java.base/share/classes/java/lang/constant/ReferenceClassDescImpl.java
rename to src/java.base/share/classes/jdk/internal/constant/ReferenceClassDescImpl.java
index 5e2aaa98442..e8d73b08097 100644
--- a/src/java.base/share/classes/java/lang/constant/ReferenceClassDescImpl.java
+++ b/src/java.base/share/classes/jdk/internal/constant/ReferenceClassDescImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,21 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.constant;
+package jdk.internal.constant;
 
+import java.lang.constant.ClassDesc;
 import java.lang.invoke.MethodHandles;
 
-import static java.lang.constant.ConstantUtils.*;
-import static java.util.Objects.requireNonNull;
+import static jdk.internal.constant.ConstantUtils.*;
 
 /**
  * A <a href="package-summary.html#nominal">nominal descriptor</a> for a class,
  * interface, or array type.  A {@linkplain ReferenceClassDescImpl} corresponds to a
  * {@code Constant_Class_info} entry in the constant pool of a classfile.
  */
-final class ReferenceClassDescImpl implements ClassDesc {
+public final class ReferenceClassDescImpl implements ClassDesc {
     private final String descriptor;
 
+    private ReferenceClassDescImpl(String descriptor) {
+        this.descriptor = descriptor;
+    }
+
     /**
      * Creates a {@linkplain ClassDesc} from a descriptor string for a class or
      * interface type or an array type.
@@ -46,12 +50,23 @@ final class ReferenceClassDescImpl implements ClassDesc {
      * field descriptor string, or does not describe a class or interface type
      * @jvms 4.3.2 Field Descriptors
      */
-    ReferenceClassDescImpl(String descriptor) {
+    public static ReferenceClassDescImpl of(String descriptor) {
         int dLen = descriptor.length();
         int len = ConstantUtils.skipOverFieldSignature(descriptor, 0, dLen, false);
         if (len <= 1 || len != dLen)
             throw new IllegalArgumentException(String.format("not a valid reference type descriptor: %s", descriptor));
-        this.descriptor = descriptor;
+        return new ReferenceClassDescImpl(descriptor);
+    }
+
+    /**
+     * Creates a {@linkplain ClassDesc} from a pre-validated descriptor string
+     * for a class or interface type or an array type.
+     *
+     * @param descriptor a field descriptor string for a class or interface type
+     * @jvms 4.3.2 Field Descriptors
+     */
+    public static ReferenceClassDescImpl ofValidated(String descriptor) {
+        return new ReferenceClassDescImpl(descriptor);
     }
 
     @Override
diff --git a/src/java.base/share/classes/jdk/internal/io/JdkConsole.java b/src/java.base/share/classes/jdk/internal/io/JdkConsole.java
index a75941fd2a5..2d48748fbfc 100644
--- a/src/java.base/share/classes/jdk/internal/io/JdkConsole.java
+++ b/src/java.base/share/classes/jdk/internal/io/JdkConsole.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 import java.io.PrintWriter;
 import java.io.Reader;
 import java.nio.charset.Charset;
+import java.util.Locale;
 
 /**
  * Delegate interface for custom Console implementations.
@@ -37,11 +38,10 @@
 public interface JdkConsole {
     PrintWriter writer();
     Reader reader();
-    JdkConsole format(String fmt, Object ... args);
-    JdkConsole printf(String format, Object ... args);
-    String readLine(String fmt, Object ... args);
+    JdkConsole format(Locale locale, String format, Object ... args);
+    String readLine(Locale locale, String format, Object ... args);
     String readLine();
-    char[] readPassword(String fmt, Object ... args);
+    char[] readPassword(Locale locale, String format, Object ... args);
     char[] readPassword();
     void flush();
     Charset charset();
diff --git a/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java b/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
index a75ff582085..e25626ead0c 100644
--- a/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
+++ b/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@
 import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Formatter;
+import java.util.Locale;
 import java.util.Objects;
 
 import jdk.internal.access.SharedSecrets;
@@ -57,23 +58,18 @@ public Reader reader() {
     }
 
     @Override
-    public JdkConsole format(String fmt, Object ... args) {
-        formatter.format(fmt, args).flush();
+    public JdkConsole format(Locale locale, String format, Object ... args) {
+        formatter.format(locale, format, args).flush();
         return this;
     }
 
     @Override
-    public JdkConsole printf(String format, Object ... args) {
-        return format(format, args);
-    }
-
-    @Override
-    public String readLine(String fmt, Object ... args) {
+    public String readLine(Locale locale, String format, Object ... args) {
         String line = null;
         synchronized (writeLock) {
             synchronized(readLock) {
-                if (!fmt.isEmpty())
-                    pw.format(fmt, args);
+                if (!format.isEmpty())
+                    pw.format(locale, format, args);
                 try {
                     char[] ca = readline(false);
                     if (ca != null)
@@ -88,11 +84,11 @@ public String readLine(String fmt, Object ... args) {
 
     @Override
     public String readLine() {
-        return readLine("");
+        return readLine(Locale.getDefault(Locale.Category.FORMAT), "");
     }
 
     @Override
-    public char[] readPassword(String fmt, Object ... args) {
+    public char[] readPassword(Locale locale, String format, Object ... args) {
         char[] passwd = null;
         synchronized (writeLock) {
             synchronized(readLock) {
@@ -104,8 +100,8 @@ public char[] readPassword(String fmt, Object ... args) {
                 }
                 IOError ioe = null;
                 try {
-                    if (!fmt.isEmpty())
-                        pw.format(fmt, args);
+                    if (!format.isEmpty())
+                        pw.format(locale, format, args);
                     passwd = readline(true);
                 } catch (IOException x) {
                     ioe = new IOError(x);
@@ -164,7 +160,7 @@ public void run() {
 
     @Override
     public char[] readPassword() {
-        return readPassword("");
+        return readPassword(Locale.getDefault(Locale.Category.FORMAT), "");
     }
 
     @Override
diff --git a/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributes.java b/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributes.java
index 5dd556215d3..f0804b58c1c 100644
--- a/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributes.java
+++ b/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@ final class JrtFileAttributes  implements BasicFileAttributes {
         this.node = node;
     }
 
-    ///////// basic attributes ///////////
+    //-------- basic attributes --------
     @Override
     public FileTime creationTime() {
         return node.creationTime();
@@ -92,7 +92,7 @@ public Object fileKey() {
         return node.resolveLink(true);
     }
 
-    ///////// jrtfs specific attributes ///////////
+    //-------- jrtfs specific attributes --------
     /**
      * Compressed resource file. If not available or not applicable, 0L is
      * returned.
diff --git a/src/java.base/share/classes/jdk/internal/random/L128X1024MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L128X1024MixRandom.java
index e6f4f896dc0..4af9ecc3dd4 100644
--- a/src/java.base/share/classes/jdk/internal/random/L128X1024MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L128X1024MixRandom.java
@@ -29,7 +29,6 @@
 import java.util.random.RandomGenerator;
 import jdk.internal.util.random.RandomSupport;
 import jdk.internal.util.random.RandomSupport.AbstractSplittableWithBrineGenerator;
-import jdk.internal.util.random.RandomSupport.RandomGeneratorProperties;
 
 /**
  * A "splittable" pseudorandom number generator (PRNG) whose period
@@ -75,12 +74,6 @@
  * @since   17
  *
  */
-@RandomGeneratorProperties(
-        name = "L128X1024MixRandom",
-        group = "LXM",
-        i = 1024, j = 1, k = 128,
-        equidistribution = 1
-)
 public final class L128X1024MixRandom extends AbstractSplittableWithBrineGenerator {
 
     /*
diff --git a/src/java.base/share/classes/jdk/internal/random/L128X128MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L128X128MixRandom.java
index d03fcfc0864..1323139ea59 100644
--- a/src/java.base/share/classes/jdk/internal/random/L128X128MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L128X128MixRandom.java
@@ -29,7 +29,6 @@
 import java.util.random.RandomGenerator;
 import jdk.internal.util.random.RandomSupport;
 import jdk.internal.util.random.RandomSupport.AbstractSplittableWithBrineGenerator;
-import jdk.internal.util.random.RandomSupport.RandomGeneratorProperties;
 
 /**
  * A "splittable" pseudorandom number generator (PRNG) whose period
@@ -75,12 +74,6 @@
  * @since   17
  *
  */
-@RandomGeneratorProperties(
-        name = "L128X128MixRandom",
-        group = "LXM",
-        i = 128, j = 1, k = 128,
-        equidistribution = 1
-)
 public final class L128X128MixRandom extends AbstractSplittableWithBrineGenerator {
 
     /*
diff --git a/src/java.base/share/classes/jdk/internal/random/L128X256MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L128X256MixRandom.java
index 81440d7316a..19fd31b069a 100644
--- a/src/java.base/share/classes/jdk/internal/random/L128X256MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L128X256MixRandom.java
@@ -29,7 +29,6 @@
 import java.util.random.RandomGenerator;
 import jdk.internal.util.random.RandomSupport;
 import jdk.internal.util.random.RandomSupport.AbstractSplittableWithBrineGenerator;
-import jdk.internal.util.random.RandomSupport.RandomGeneratorProperties;
 
 /**
  * A "splittable" pseudorandom number generator (PRNG) whose period
@@ -75,12 +74,6 @@
  * @since   17
  *
  */
-@RandomGeneratorProperties(
-        name = "L128X256MixRandom",
-        group = "LXM",
-        i = 256, j = 1, k = 128,
-        equidistribution = 1
-)
 public final class L128X256MixRandom extends AbstractSplittableWithBrineGenerator {
 
     /*
diff --git a/src/java.base/share/classes/jdk/internal/random/L32X64MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L32X64MixRandom.java
index 0f6beea7bc7..a9442bd0ef2 100644
--- a/src/java.base/share/classes/jdk/internal/random/L32X64MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L32X64MixRandom.java
@@ -29,7 +29,6 @@
 import java.util.random.RandomGenerator;
 import jdk.internal.util.random.RandomSupport;
 import jdk.internal.util.random.RandomSupport.AbstractSplittableWithBrineGenerator;
-import jdk.internal.util.random.RandomSupport.RandomGeneratorProperties;
 
 /**
  * A "splittable" pseudorandom number generator (PRNG) whose period
@@ -75,12 +74,6 @@
  * @since   17
  *
  */
-@RandomGeneratorProperties(
-        name = "L32X64MixRandom",
-        group = "LXM",
-        i = 64, j = 1, k = 32,
-        equidistribution = 1
-)
 public final class L32X64MixRandom extends AbstractSplittableWithBrineGenerator {
     /*
      * Implementation Overview.
diff --git a/src/java.base/share/classes/jdk/internal/random/L64X1024MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L64X1024MixRandom.java
index e4eb82d450e..074aac0c70e 100644
--- a/src/java.base/share/classes/jdk/internal/random/L64X1024MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L64X1024MixRandom.java
@@ -29,7 +29,6 @@
 import java.util.random.RandomGenerator;
 import jdk.internal.util.random.RandomSupport;
 import jdk.internal.util.random.RandomSupport.AbstractSplittableWithBrineGenerator;
-import jdk.internal.util.random.RandomSupport.RandomGeneratorProperties;
 
 /**
  * A "splittable" pseudorandom number generator (PRNG) whose period
@@ -75,12 +74,6 @@
  * @since   17
  *
  */
-@RandomGeneratorProperties(
-        name = "L64X1024MixRandom",
-        group = "LXM",
-        i = 1024, j = 1, k = 64,
-        equidistribution = 16
-)
 public final class L64X1024MixRandom extends AbstractSplittableWithBrineGenerator {
 
     /*
diff --git a/src/java.base/share/classes/jdk/internal/random/L64X128MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L64X128MixRandom.java
index 7dd757f312b..37e10237c39 100644
--- a/src/java.base/share/classes/jdk/internal/random/L64X128MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L64X128MixRandom.java
@@ -29,7 +29,6 @@
 import java.util.random.RandomGenerator;
 import jdk.internal.util.random.RandomSupport;
 import jdk.internal.util.random.RandomSupport.AbstractSplittableWithBrineGenerator;
-import jdk.internal.util.random.RandomSupport.RandomGeneratorProperties;
 
 /**
  * A "splittable" pseudorandom number generator (PRNG) whose period
@@ -75,12 +74,6 @@
  * @since   17
  *
  */
-@RandomGeneratorProperties(
-        name = "L64X128MixRandom",
-        group = "LXM",
-        i = 128, j = 1, k = 64,
-        equidistribution = 2
-)
 public final class L64X128MixRandom extends AbstractSplittableWithBrineGenerator {
 
     /*
diff --git a/src/java.base/share/classes/jdk/internal/random/L64X128StarStarRandom.java b/src/java.base/share/classes/jdk/internal/random/L64X128StarStarRandom.java
index 15b9bc312da..1d1a00ca006 100644
--- a/src/java.base/share/classes/jdk/internal/random/L64X128StarStarRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L64X128StarStarRandom.java
@@ -29,7 +29,6 @@
 import java.util.random.RandomGenerator;
 import jdk.internal.util.random.RandomSupport;
 import jdk.internal.util.random.RandomSupport.AbstractSplittableWithBrineGenerator;
-import jdk.internal.util.random.RandomSupport.RandomGeneratorProperties;
 
 /**
  * A "splittable" pseudorandom number generator (PRNG) whose period
@@ -75,12 +74,6 @@
  * @since   17
  *
  */
-@RandomGeneratorProperties(
-        name = "L64X128StarStarRandom",
-        group = "LXM",
-        i = 128, j = 1, k = 64,
-        equidistribution = 2
-)
 public final class L64X128StarStarRandom extends AbstractSplittableWithBrineGenerator {
 
     /*
diff --git a/src/java.base/share/classes/jdk/internal/random/L64X256MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L64X256MixRandom.java
index bb605df5fdc..109148e3f01 100644
--- a/src/java.base/share/classes/jdk/internal/random/L64X256MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L64X256MixRandom.java
@@ -29,7 +29,6 @@
 import java.util.random.RandomGenerator;
 import jdk.internal.util.random.RandomSupport;
 import jdk.internal.util.random.RandomSupport.AbstractSplittableWithBrineGenerator;
-import jdk.internal.util.random.RandomSupport.RandomGeneratorProperties;
 
 /**
  * A "splittable" pseudorandom number generator (PRNG) whose period
@@ -75,12 +74,6 @@
  * @since   17
  *
  */
-@RandomGeneratorProperties(
-        name = "L64X256MixRandom",
-        group = "LXM",
-        i = 256, j = 1, k = 64,
-        equidistribution = 4
-)
 public final class L64X256MixRandom extends AbstractSplittableWithBrineGenerator {
 
     /*
diff --git a/src/java.base/share/classes/jdk/internal/random/Xoroshiro128PlusPlus.java b/src/java.base/share/classes/jdk/internal/random/Xoroshiro128PlusPlus.java
index d20b3cf9e6a..3dc90fff4d0 100644
--- a/src/java.base/share/classes/jdk/internal/random/Xoroshiro128PlusPlus.java
+++ b/src/java.base/share/classes/jdk/internal/random/Xoroshiro128PlusPlus.java
@@ -29,7 +29,6 @@
 import java.util.random.RandomGenerator;
 import java.util.random.RandomGenerator.LeapableGenerator;
 import jdk.internal.util.random.RandomSupport;
-import jdk.internal.util.random.RandomSupport.RandomGeneratorProperties;
 
 /**
  * A "jumpable and leapable" pseudorandom number generator (PRNG) whose period
@@ -72,12 +71,6 @@
  * @since   17
  *
  */
-@RandomGeneratorProperties(
-        name = "Xoroshiro128PlusPlus",
-        group = "Xoroshiro",
-        i = 128, j = 1, k = 0,
-        equidistribution = 1
-)
 public final class Xoroshiro128PlusPlus implements LeapableGenerator {
 
     /*
diff --git a/src/java.base/share/classes/jdk/internal/random/Xoshiro256PlusPlus.java b/src/java.base/share/classes/jdk/internal/random/Xoshiro256PlusPlus.java
index fdefe02dd03..1ae4aeaac02 100644
--- a/src/java.base/share/classes/jdk/internal/random/Xoshiro256PlusPlus.java
+++ b/src/java.base/share/classes/jdk/internal/random/Xoshiro256PlusPlus.java
@@ -29,7 +29,6 @@
 import java.util.random.RandomGenerator;
 import java.util.random.RandomGenerator.LeapableGenerator;
 import jdk.internal.util.random.RandomSupport;
-import jdk.internal.util.random.RandomSupport.RandomGeneratorProperties;
 
 /**
  * A "jumpable and leapable" pseudorandom number generator (PRNG) whose period
@@ -87,12 +86,6 @@
  * @since   17
  *
  */
-@RandomGeneratorProperties(
-        name = "Xoshiro256PlusPlus",
-        group = "Xoshiro",
-        i = 256, j = 1, k = 0,
-        equidistribution = 3
-)
 public final class Xoshiro256PlusPlus implements LeapableGenerator {
 
     /*
diff --git a/src/java.base/share/classes/jdk/internal/util/random/RandomSupport.java b/src/java.base/share/classes/jdk/internal/util/random/RandomSupport.java
index c80d67005ae..402be6b5dfe 100644
--- a/src/java.base/share/classes/jdk/internal/util/random/RandomSupport.java
+++ b/src/java.base/share/classes/jdk/internal/util/random/RandomSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,7 @@
 
 package jdk.internal.util.random;
 
-import java.lang.annotation.*;
-import java.math.BigInteger;
 import java.util.Objects;
-import java.util.Random;
 import java.util.function.Consumer;
 import java.util.function.DoubleConsumer;
 import java.util.function.IntConsumer;
@@ -53,49 +50,6 @@
  * @since 17
  */
 public class RandomSupport {
-    /**
-     * Annotation providing RandomGenerator properties.
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.TYPE)
-    public @interface RandomGeneratorProperties {
-        /**
-         * Name of algorithm.
-         */
-        String name();
-
-        /**
-         * Category of algorithm.
-         */
-        String group() default "Legacy";
-
-        /**
-         * Algorithm period defined as:
-         *
-         * BigInteger.ONE.shiftLeft(i)
-         *               .subtract(j)
-         *               .shiftLeft(k)
-         */
-        int i() default 0;
-        int j() default 0;
-        int k() default 0;
-
-        /**
-         * The equidistribution of the algorithm.
-         */
-        int equidistribution() default Integer.MAX_VALUE;
-
-        /**
-         * Is the algorithm based on entropy (true random.)
-         */
-        boolean isStochastic() default false;
-
-        /**
-         * Is the algorithm assisted by hardware (fast true random.)
-         */
-        boolean isHardware() default false;
-    }
-
     /*
      * Implementation Overview.
      *
diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index edbbad78c9d..a8b0a0c992c 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -419,19 +419,4 @@
     provides java.nio.file.spi.FileSystemProvider with
         jdk.internal.jrtfs.JrtFileSystemProvider;
 
-    provides java.util.random.RandomGenerator with
-        java.security.SecureRandom,
-        java.util.Random,
-        java.util.SplittableRandom,
-        jdk.internal.random.L32X64MixRandom,
-        jdk.internal.random.L64X128MixRandom,
-        jdk.internal.random.L64X128StarStarRandom,
-        jdk.internal.random.L64X256MixRandom,
-        jdk.internal.random.L64X1024MixRandom,
-        jdk.internal.random.L128X128MixRandom,
-        jdk.internal.random.L128X256MixRandom,
-        jdk.internal.random.L128X1024MixRandom,
-        jdk.internal.random.Xoroshiro128PlusPlus,
-        jdk.internal.random.Xoshiro256PlusPlus;
-
 }
diff --git a/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java b/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
index 8826cc3c188..324c481f8a8 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, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -401,7 +401,7 @@ public Set<SocketOption<?>> supportedOptions() {
     private InetAddress outgoingInetAddress;
 
     @Override
-    @Deprecated
+    @SuppressWarnings("removal")
     public void setTTL(byte ttl) throws IOException {
         setTimeToLive(Byte.toUnsignedInt(ttl));
     }
@@ -417,7 +417,7 @@ public void setTimeToLive(int ttl) throws IOException {
     }
 
     @Override
-    @Deprecated
+    @SuppressWarnings("removal")
     public byte getTTL() throws IOException {
         return (byte) getTimeToLive();
     }
@@ -592,7 +592,7 @@ public boolean getLoopbackMode() throws SocketException {
     }
 
     @Override
-    @Deprecated
+    @SuppressWarnings("removal")
     public void send(DatagramPacket p, byte ttl) throws IOException {
         sendLock.lock();
         try {
diff --git a/src/java.base/share/classes/sun/security/ec/ECDHKeyAgreement.java b/src/java.base/share/classes/sun/security/ec/ECDHKeyAgreement.java
index 1fdbd94786a..be3bdfdd639 100644
--- a/src/java.base/share/classes/sun/security/ec/ECDHKeyAgreement.java
+++ b/src/java.base/share/classes/sun/security/ec/ECDHKeyAgreement.java
@@ -31,6 +31,7 @@
 import sun.security.util.ECUtil;
 import sun.security.util.NamedCurve;
 import sun.security.util.math.IntegerFieldModuloP;
+import sun.security.util.math.IntegerMontgomeryFieldModuloP;
 import sun.security.util.math.MutableIntegerModuloP;
 import sun.security.util.math.SmallValue;
 
@@ -265,6 +266,11 @@ byte[] deriveKeyImpl(ECPrivateKey priv, ECOperations ops,
         ECPublicKey pubKey) throws InvalidKeyException {
 
         IntegerFieldModuloP field = ops.getField();
+        if (field instanceof IntegerMontgomeryFieldModuloP) {
+            // No point of doing a single SmallValue operation in Montgomery domain
+            field = ((IntegerMontgomeryFieldModuloP)field).residueField();
+        }
+
         // convert s array into field element and multiply by the cofactor
         MutableIntegerModuloP scalar = field.getElement(priv.getS()).mutable();
         SmallValue cofactor =
diff --git a/src/java.base/share/classes/sun/security/ec/ECDSAOperations.java b/src/java.base/share/classes/sun/security/ec/ECDSAOperations.java
index 7bbcbd032f1..f58d7d8f2d7 100644
--- a/src/java.base/share/classes/sun/security/ec/ECDSAOperations.java
+++ b/src/java.base/share/classes/sun/security/ec/ECDSAOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -252,7 +252,7 @@ public boolean verifySignedDigest(byte[] digest, byte[] sig, ECPoint pp) {
         MutablePoint p1 = ecOps.multiply(basePoint, temp1);
         MutablePoint p2 = ecOps.multiply(pp, temp2);
 
-        ecOps.setSum(p1, p2.asAffine());
+        ecOps.setSum(p1, p2);
         IntegerModuloP result = p1.asAffine().getX();
         b2a(result, orderField, temp1);
         return MessageDigest.isEqual(temp1, r);
diff --git a/src/java.base/share/classes/sun/security/ec/ECOperations.java b/src/java.base/share/classes/sun/security/ec/ECOperations.java
index d4959aed463..2f94bb85342 100644
--- a/src/java.base/share/classes/sun/security/ec/ECOperations.java
+++ b/src/java.base/share/classes/sun/security/ec/ECOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,12 +46,7 @@
  * Formulas are derived from "Complete addition formulas for prime order
  * elliptic curves" by Renes, Costello, and Batina.
  */
-
 public class ECOperations {
-    private static final ECOperations secp256r1Ops =
-        new ECOperations(IntegerPolynomialP256.ONE.getElement(
-                CurveDB.lookup(KnownOIDs.secp256r1.value()).getCurve().getB()),
-                P256OrderField.ONE);
 
     /*
      * An exception indicating a problem with an intermediate value produced
@@ -64,7 +59,7 @@ static class IntermediateValueException extends Exception {
     }
 
     static final Map<BigInteger, IntegerFieldModuloP> fields = Map.of(
-        IntegerPolynomialP256.MODULUS, IntegerPolynomialP256.ONE,
+        IntegerPolynomialP256.MODULUS, MontgomeryIntegerPolynomialP256.ONE,
         IntegerPolynomialP384.MODULUS, IntegerPolynomialP384.ONE,
         IntegerPolynomialP521.MODULUS, IntegerPolynomialP521.ONE
     );
@@ -207,11 +202,28 @@ public static boolean allZero(byte[] arr) {
      * @return the product
      */
     public MutablePoint multiply(AffinePoint affineP, byte[] s) {
-        return PointMultiplier.of(this, affineP).pointMultiply(s);
+        PointMultiplier multiplier = null;
+        if (getField() instanceof IntegerMontgomeryFieldModuloP
+                && affineP.equals(Secp256R1GeneratorMontgomeryMultiplier.generator)) {
+            // Lazy class loading here
+            multiplier = Secp256R1GeneratorMontgomeryMultiplier.multiplier;
+        } else {
+            multiplier = new DefaultMultiplier(this, affineP);
+        }
+
+        return multiplier.pointMultiply(s);
     }
 
+    /**
+     * Multiply an affine ecpoint point by a scalar and return the result as a
+     * mutable point.
+     *
+     * @param ecPoint the point
+     * @param s the scalar as a little-endian array
+     * @return the product
+     */
     public MutablePoint multiply(ECPoint ecPoint, byte[] s) {
-        return PointMultiplier.of(this, ecPoint).pointMultiply(s);
+        return multiply(AffinePoint.fromECPoint(ecPoint, getField()), s);
     }
 
     /*
@@ -264,21 +276,26 @@ private void setDouble(ProjectivePoint.Mutable p, MutableIntegerModuloP t0,
 
     }
 
-    /*
-     * Mixed point addition. This method constructs new temporaries each time
-     * it is called. For better efficiency, the method that reuses temporaries
-     * should be used if more than one sum will be computed.
+    /**
+     * Adds second Mutable (Projective) point to first.
+     *
+     * Used by ECDSAOperations. This method constructs new temporaries each time
+     * it is called. For better efficiency, the (private) method that reuses
+     * temporaries should be used if more than one sum will be computed.
+     *
+     * @param p first point and result
+     * @param p2 second point to add
      */
-    public void setSum(MutablePoint p, AffinePoint p2) {
-
+    public void setSum(MutablePoint p, MutablePoint p2) {
         IntegerModuloP zero = p.getField().get0();
         MutableIntegerModuloP t0 = zero.mutable();
         MutableIntegerModuloP t1 = zero.mutable();
         MutableIntegerModuloP t2 = zero.mutable();
         MutableIntegerModuloP t3 = zero.mutable();
         MutableIntegerModuloP t4 = zero.mutable();
-        setSum((ProjectivePoint.Mutable) p, p2, t0, t1, t2, t3, t4);
 
+        setSum((ProjectivePoint.Mutable) p, (ProjectivePoint.Mutable) p2,
+            t0, t1, t2, t3, t4);
     }
 
     /*
@@ -289,18 +306,18 @@ private void setSum(ProjectivePoint.Mutable p, AffinePoint p2,
         MutableIntegerModuloP t2, MutableIntegerModuloP t3,
         MutableIntegerModuloP t4) {
 
-        t0.setValue(p.getX()).setProduct(p2.getX());
-        t1.setValue(p.getY()).setProduct(p2.getY());
-        t3.setValue(p2.getX()).setSum(p2.getY());
+        t0.setValue(p.getX()).setProduct(p2.getX(false));
+        t1.setValue(p.getY()).setProduct(p2.getY(false));
+        t3.setValue(p2.getX(false)).setSum(p2.getY(false));
         t4.setValue(p.getX()).setSum(p.getY());
         t3.setProduct(t4);
         t4.setValue(t0).setSum(t1);
 
         t3.setDifference(t4);
-        t4.setValue(p2.getY()).setProduct(p.getZ());
+        t4.setValue(p2.getY(false)).setProduct(p.getZ());
         t4.setSum(p.getY());
 
-        p.getY().setValue(p2.getX()).setProduct(p.getZ());
+        p.getY().setValue(p2.getX(false)).setProduct(p.getZ());
         p.getY().setSum(p.getX());
         t2.setValue(p.getZ());
         p.getZ().setProduct(b);
@@ -412,11 +429,8 @@ public boolean checkOrder(ECPoint point) {
         return isNeutral(this.multiply(ap, scalar));
     }
 
-    sealed interface PointMultiplier {
-        Map<ECPoint, PointMultiplier> multipliers = Map.of(
-                Secp256R1GeneratorMultiplier.generator,
-                Secp256R1GeneratorMultiplier.multiplier);
-
+    sealed interface PointMultiplier
+        permits DefaultMultiplier, Secp256R1GeneratorMontgomeryMultiplier {
         // Multiply the point by a scalar and return the result as a mutable
         // point.  The multiplier point is specified by the implementation of
         // this interface, which could be a general EC point or EC generator
@@ -429,26 +443,6 @@ sealed interface PointMultiplier {
         // in little endian byte array representation.
         ProjectivePoint.Mutable pointMultiply(byte[] scalar);
 
-        static PointMultiplier of(ECOperations ecOps, AffinePoint affPoint) {
-            PointMultiplier multiplier = multipliers.get(affPoint.toECPoint());
-            if (multiplier == null) {
-                multiplier = new Default(ecOps, affPoint);
-            }
-
-            return multiplier;
-        }
-
-        static PointMultiplier of(ECOperations ecOps, ECPoint ecPoint) {
-            PointMultiplier multiplier = multipliers.get(ecPoint);
-            if (multiplier == null) {
-                AffinePoint affPoint =
-                        AffinePoint.fromECPoint(ecPoint, ecOps.getField());
-                multiplier = new Default(ecOps, affPoint);
-            }
-
-            return multiplier;
-        }
-
         private static void lookup(
                 ProjectivePoint.Immutable[] ips, int index,
                 ProjectivePoint.Mutable result) {
@@ -465,232 +459,249 @@ private static void lookup(
                 result.conditionalSet(pi, set);
             }
         }
+    }
 
-        final class Default implements PointMultiplier {
-            private final AffinePoint affineP;
-            private final ECOperations ecOps;
+    final static class DefaultMultiplier implements PointMultiplier {
+        private final ECOperations ecOps;
+        private final ProjectivePoint.Immutable[] pointMultiples;
 
-            private Default(ECOperations ecOps, AffinePoint affineP) {
-                this.ecOps = ecOps;
-                this.affineP = affineP;
-            }
+        DefaultMultiplier(ECOperations ecOps, AffinePoint affineP) {
+            this.ecOps = ecOps;
 
-            @Override
-            public ProjectivePoint.Mutable pointMultiply(byte[] s) {
-                // 4-bit windowed multiply with branchless lookup.
-                // The mixed addition is faster, so it is used to construct
-                // the array at the beginning of the operation.
-
-                IntegerFieldModuloP field = affineP.getX().getField();
-                ImmutableIntegerModuloP zero = field.get0();
-                // temporaries
-                MutableIntegerModuloP t0 = zero.mutable();
-                MutableIntegerModuloP t1 = zero.mutable();
-                MutableIntegerModuloP t2 = zero.mutable();
-                MutableIntegerModuloP t3 = zero.mutable();
-                MutableIntegerModuloP t4 = zero.mutable();
-
-                ProjectivePoint.Mutable result =
-                        new ProjectivePoint.Mutable(field);
-                result.getY().setValue(field.get1().mutable());
-
-                ProjectivePoint.Immutable[] pointMultiples =
-                        new ProjectivePoint.Immutable[16];
-                // 0P is neutral---same as initial result value
-                pointMultiples[0] = result.fixed();
-
-                ProjectivePoint.Mutable ps = new ProjectivePoint.Mutable(field);
-                ps.setValue(affineP);
-                // 1P = P
-                pointMultiples[1] = ps.fixed();
-
-                // the rest are calculated using mixed point addition
-                for (int i = 2; i < 16; i++) {
-                    ecOps.setSum(ps, affineP, t0, t1, t2, t3, t4);
-                    pointMultiples[i] = ps.fixed();
-                }
+            // Precompute and cache point multiples
+            this.pointMultiples = new ProjectivePoint.Immutable[16];
 
-                ProjectivePoint.Mutable lookupResult = ps.mutable();
+            IntegerFieldModuloP field = ecOps.getField();
+            ImmutableIntegerModuloP zero = field.get0();
+            // temporaries
+            MutableIntegerModuloP t0 = zero.mutable();
+            MutableIntegerModuloP t1 = zero.mutable();
+            MutableIntegerModuloP t2 = zero.mutable();
+            MutableIntegerModuloP t3 = zero.mutable();
+            MutableIntegerModuloP t4 = zero.mutable();
 
-                for (int i = s.length - 1; i >= 0; i--) {
-                    double4(result, t0, t1, t2, t3, t4);
+            ProjectivePoint.Mutable ps =
+                new ProjectivePoint.Mutable(field);
+            ps.getY().setValue(field.get1().mutable());
 
-                    int high = (0xFF & s[i]) >>> 4;
-                    lookup(pointMultiples, high, lookupResult);
-                    ecOps.setSum(result, lookupResult, t0, t1, t2, t3, t4);
+            // 0P is neutral---same as initial result value
+            pointMultiples[0] = ps.fixed();
 
-                    double4(result, t0, t1, t2, t3, t4);
+            ps.setValue(affineP);
+            // 1P = P
+            pointMultiples[1] = ps.fixed();
 
-                    int low = 0xF & s[i];
-                    lookup(pointMultiples, low, lookupResult);
-                    ecOps.setSum(result, lookupResult, t0, t1, t2, t3, t4);
-                }
+            // the rest are calculated using mixed point addition
+            for (int i = 2; i < 16; i++) {
+                ecOps.setSum(ps, affineP, t0, t1, t2, t3, t4);
+                pointMultiples[i] = ps.fixed();
+            }
+        }
 
-                return result;
+        @Override
+        public ProjectivePoint.Mutable pointMultiply(byte[] s) {
+            // 4-bit windowed multiply with branchless lookup.
+            // The mixed addition is faster, so it is used to construct
+            // the array at the beginning of the operation.
+
+            IntegerFieldModuloP field = ecOps.getField();
+            ImmutableIntegerModuloP zero = field.get0();
+            // temporaries
+            MutableIntegerModuloP t0 = zero.mutable();
+            MutableIntegerModuloP t1 = zero.mutable();
+            MutableIntegerModuloP t2 = zero.mutable();
+            MutableIntegerModuloP t3 = zero.mutable();
+            MutableIntegerModuloP t4 = zero.mutable();
+
+            ProjectivePoint.Mutable result = new ProjectivePoint.Mutable(field);
+            result.getY().setValue(field.get1().mutable());
+            ProjectivePoint.Mutable lookupResult = new ProjectivePoint.Mutable(field);
+
+            for (int i = s.length - 1; i >= 0; i--) {
+                double4(result, t0, t1, t2, t3, t4);
+
+                int high = (0xFF & s[i]) >>> 4;
+                PointMultiplier.lookup(pointMultiples, high, lookupResult);
+                ecOps.setSum(result, lookupResult, t0, t1, t2, t3, t4);
+
+                double4(result, t0, t1, t2, t3, t4);
+
+                int low = 0xF & s[i];
+                PointMultiplier.lookup(pointMultiples, low, lookupResult);
+                ecOps.setSum(result, lookupResult, t0, t1, t2, t3, t4);
             }
 
-            private void double4(ProjectivePoint.Mutable p,
-                    MutableIntegerModuloP t0, MutableIntegerModuloP t1,
-                    MutableIntegerModuloP t2, MutableIntegerModuloP t3,
-                    MutableIntegerModuloP t4) {
-                for (int i = 0; i < 4; i++) {
-                    ecOps.setDouble(p, t0, t1, t2, t3, t4);
-                }
+            return result;
+        }
+
+        private void double4(ProjectivePoint.Mutable p,
+                MutableIntegerModuloP t0, MutableIntegerModuloP t1,
+                MutableIntegerModuloP t2, MutableIntegerModuloP t3,
+                MutableIntegerModuloP t4) {
+            for (int i = 0; i < 4; i++) {
+                ecOps.setDouble(p, t0, t1, t2, t3, t4);
+            }
+        }
+    }
+
+    // Represents a multiplier with a larger precomputed table. Intended to be
+    // used for Basepoint multiplication
+    final static class Secp256R1GeneratorMontgomeryMultiplier
+        implements PointMultiplier {
+        private static final ECOperations secp256r1Ops = new ECOperations(
+            MontgomeryIntegerPolynomialP256.ONE.getElement(
+                    CurveDB.P_256.getCurve().getB()), P256OrderField.ONE);
+        public static final AffinePoint generator = AffinePoint.fromECPoint(
+            CurveDB.P_256.getGenerator(), secp256r1Ops.getField());
+        public static final PointMultiplier multiplier =
+            new Secp256R1GeneratorMontgomeryMultiplier();
+
+        private final ImmutableIntegerModuloP zero;
+        private final ImmutableIntegerModuloP one;
+        private final ProjectivePoint.Immutable[][] points;
+        private final BigInteger[] base;
+
+        private Secp256R1GeneratorMontgomeryMultiplier() {
+            this(MontgomeryIntegerPolynomialP256.ONE,
+                new DefaultMultiplier(secp256r1Ops, generator));
+
+            // Check that the tables are correctly generated.
+            if (ECOperations.class.desiredAssertionStatus()) {
+                verifyTables(this);
             }
         }
 
-        final class Secp256R1GeneratorMultiplier implements PointMultiplier {
-            private static final ECPoint generator =
-                    CurveDB.P_256.getGenerator();
-            private static final PointMultiplier multiplier =
-                    new Secp256R1GeneratorMultiplier();
-
-            private static final ImmutableIntegerModuloP zero =
-                    IntegerPolynomialP256.ONE.get0();
-            private static final ImmutableIntegerModuloP one =
-                    IntegerPolynomialP256.ONE.get1();
-
-            @Override
-            public ProjectivePoint.Mutable pointMultiply(byte[] s) {
-                MutableIntegerModuloP t0 = zero.mutable();
-                MutableIntegerModuloP t1 = zero.mutable();
-                MutableIntegerModuloP t2 = zero.mutable();
-                MutableIntegerModuloP t3 = zero.mutable();
-                MutableIntegerModuloP t4 = zero.mutable();
-
-                ProjectivePoint.Mutable d = new ProjectivePoint.Mutable(
-                        zero.mutable(),
-                        one.mutable(),
-                        zero.mutable());
-                ProjectivePoint.Mutable r = d.mutable();
-                for (int i = 15; i >= 0; i--) {
-                    secp256r1Ops.setDouble(d, t0, t1, t2, t3, t4);
-                    for (int j = 3; j >= 0; j--) {
-                        int pos = i + j * 16;
-                        int index = (bit(s, pos + 192) << 3) |
-                                    (bit(s, pos + 128) << 2) |
-                                    (bit(s, pos +  64) << 1) |
-                                     bit(s, pos);
-
-                        lookup(P256.points[j], index, r);
-                        secp256r1Ops.setSum(d, r, t0, t1, t2, t3, t4);
+        private Secp256R1GeneratorMontgomeryMultiplier(
+            IntegerFieldModuloP field, PointMultiplier smallTableMultiplier) {
+            zero = field.get0();
+            one = field.get1();
+
+            // Pre-computed table to speed up the point multiplication.
+            //
+            // This is a 4x16 array of ProjectivePoint.Immutable elements.
+            // The first row contains the following multiples of the
+            // generator.
+            //
+            // index   |    point
+            // --------+----------------
+            // 0x0000  | 0G
+            // 0x0001  | 1G
+            // 0x0002  | (2^64)G
+            // 0x0003  | (2^64 + 1)G
+            // 0x0004  | 2^128G
+            // 0x0005  | (2^128 + 1)G
+            // 0x0006  | (2^128 + 2^64)G
+            // 0x0007  | (2^128 + 2^64 + 1)G
+            // 0x0008  | 2^192G
+            // 0x0009  | (2^192 + 1)G
+            // 0x000A  | (2^192 + 2^64)G
+            // 0x000B  | (2^192 + 2^64 + 1)G
+            // 0x000C  | (2^192 + 2^128)G
+            // 0x000D  | (2^192 + 2^128 + 1)G
+            // 0x000E  | (2^192 + 2^128 + 2^64)G
+            // 0x000F  | (2^192 + 2^128 + 2^64 + 1)G
+            //
+            // For the other 3 rows, points[i][j] = 2^16 * (points[i-1][j].
+
+            // Generate the pre-computed tables.  This block may be
+            // replaced with hard-coded tables in order to speed up
+            // the class loading.
+            points = new ProjectivePoint.Immutable[4][16];
+            BigInteger[] factors = new BigInteger[] {
+                    BigInteger.ONE,
+                    BigInteger.TWO.pow(64),
+                    BigInteger.TWO.pow(128),
+                    BigInteger.TWO.pow(192)
+            };
+
+            base = new BigInteger[16];
+            base[0] = BigInteger.ZERO;
+            base[1] = BigInteger.ONE;
+            base[2] = factors[1];
+            for (int i = 3; i < 16; i++) {
+                base[i] = BigInteger.ZERO;
+                for (int k = 0; k < 4; k++) {
+                    if (((i >>> k) & 0x01) != 0) {
+                        base[i] = base[i].add(factors[k]);
                     }
                 }
+            }
 
-                return d;
+            for (int d = 0; d < 4; d++) {
+                for (int w = 0; w < 16; w++) {
+                    BigInteger bi = base[w];
+                    if (d != 0) {
+                        bi = bi.multiply(BigInteger.TWO.pow(d * 16));
+                    }
+                    if (w == 0) {
+                        points[d][0] = new ProjectivePoint.Immutable(
+                            zero.fixed(), one.fixed(), zero.fixed());
+                    } else {
+                        byte[] s = bi.toByteArray();
+                        ArrayUtil.reverse(s);
+                        ProjectivePoint.Mutable m = smallTableMultiplier.pointMultiply(s);
+                        points[d][w] = m.fixed();
+                    }
+                }
             }
+        }
 
-            private static int bit(byte[] k, int i) {
-                return (k[i >> 3] >> (i & 0x07)) & 0x01;
+        public ProjectivePoint.Mutable pointMultiply(byte[] s) {
+            MutableIntegerModuloP t0 = zero.mutable();
+            MutableIntegerModuloP t1 = zero.mutable();
+            MutableIntegerModuloP t2 = zero.mutable();
+            MutableIntegerModuloP t3 = zero.mutable();
+            MutableIntegerModuloP t4 = zero.mutable();
+
+            ProjectivePoint.Mutable d = new ProjectivePoint.Mutable(
+                    zero.mutable(),
+                    one.mutable(),
+                    zero.mutable());
+            ProjectivePoint.Mutable r = d.mutable();
+            for (int i = 15; i >= 0; i--) {
+                secp256r1Ops.setDouble(d, t0, t1, t2, t3, t4);
+                for (int j = 3; j >= 0; j--) {
+                    int pos = i + j * 16;
+                    int index = (bit(s, pos + 192) << 3) |
+                                (bit(s, pos + 128) << 2) |
+                                (bit(s, pos +  64) << 1) |
+                                    bit(s, pos);
+
+                    PointMultiplier.lookup(points[j], index, r);
+                    secp256r1Ops.setSum(d, r, t0, t1, t2, t3, t4);
+                }
             }
 
-            // Lazy loading of the tables.
-            private static final class P256 {
-                // Pre-computed table to speed up the point multiplication.
-                //
-                // This is a 4x16 array of ProjectivePoint.Immutable elements.
-                // The first row contains the following multiples of the
-                // generator.
-                //
-                // index   |    point
-                // --------+----------------
-                // 0x0000  | 0G
-                // 0x0001  | 1G
-                // 0x0002  | (2^64)G
-                // 0x0003  | (2^64 + 1)G
-                // 0x0004  | 2^128G
-                // 0x0005  | (2^128 + 1)G
-                // 0x0006  | (2^128 + 2^64)G
-                // 0x0007  | (2^128 + 2^64 + 1)G
-                // 0x0008  | 2^192G
-                // 0x0009  | (2^192 + 1)G
-                // 0x000A  | (2^192 + 2^64)G
-                // 0x000B  | (2^192 + 2^64 + 1)G
-                // 0x000C  | (2^192 + 2^128)G
-                // 0x000D  | (2^192 + 2^128 + 1)G
-                // 0x000E  | (2^192 + 2^128 + 2^64)G
-                // 0x000F  | (2^192 + 2^128 + 2^64 + 1)G
-                //
-                // For the other 3 rows, points[i][j] = 2^16 * (points[i-1][j].
-                private static final ProjectivePoint.Immutable[][] points;
-
-                // Generate the pre-computed tables.  This block may be
-                // replaced with hard-coded tables in order to speed up
-                // the class loading.
-                static {
-                    points = new ProjectivePoint.Immutable[4][16];
-                    BigInteger[] factors = new BigInteger[] {
-                            BigInteger.ONE,
-                            BigInteger.TWO.pow(64),
-                            BigInteger.TWO.pow(128),
-                            BigInteger.TWO.pow(192)
-                    };
-
-                    BigInteger[] base = new BigInteger[16];
-                    base[0] = BigInteger.ZERO;
-                    base[1] = BigInteger.ONE;
-                    base[2] = factors[1];
-                    for (int i = 3; i < 16; i++) {
-                        base[i] = BigInteger.ZERO;
-                        for (int k = 0; k < 4; k++) {
-                            if (((i >>> k) & 0x01) != 0) {
-                                base[i] = base[i].add(factors[k]);
-                            }
-                        }
-                    }
+            return d;
+        }
 
-                    for (int d = 0; d < 4; d++) {
-                        for (int w = 0; w < 16; w++) {
-                            BigInteger bi = base[w];
-                            if (d != 0) {
-                                bi = bi.multiply(BigInteger.TWO.pow(d * 16));
-                            }
-                            if (w == 0) {
-                                points[d][0] = new ProjectivePoint.Immutable(
-                                    zero.fixed(), one.fixed(), zero.fixed());
-                            } else {
-                                PointMultiplier multiplier = new Default(
-                                    secp256r1Ops, AffinePoint.fromECPoint(
-                                        generator, zero.getField()));
-                                byte[] s = bi.toByteArray();
-                                ArrayUtil.reverse(s);
-                                ProjectivePoint.Mutable m =
-                                        multiplier.pointMultiply(s);
-                                points[d][w] = m.setValue(m.asAffine()).fixed();
-                            }
-                        }
-                    }
+        private static int bit(byte[] k, int i) {
+            return (k[i >> 3] >> (i & 0x07)) & 0x01;
+        }
 
-                    // Check that the tables are correctly generated.
-                    if (ECOperations.class.desiredAssertionStatus()) {
-                        verifyTables(base);
+        protected void verifyTables(PointMultiplier multiplier) {
+            for (int d = 0; d < 4; d++) {
+                for (int w = 0; w < 16; w++) {
+                    BigInteger bi = base[w];
+                    if (d != 0) {
+                        bi = bi.multiply(BigInteger.TWO.pow(d * 16));
                     }
-                }
-
-                private static void verifyTables(BigInteger[] base) {
-                    for (int d = 0; d < 4; d++) {
-                        for (int w = 0; w < 16; w++) {
-                            BigInteger bi = base[w];
-                            if (d != 0) {
-                                bi = bi.multiply(BigInteger.TWO.pow(d * 16));
-                            }
-                            if (w != 0) {
-                                byte[] s = new byte[32];
-                                byte[] b = bi.toByteArray();
-                                ArrayUtil.reverse(b);
-                                System.arraycopy(b, 0, s, 0, b.length);
-
-                                ProjectivePoint.Mutable m =
-                                        multiplier.pointMultiply(s);
-                                ProjectivePoint.Immutable v =
-                                        m.setValue(m.asAffine()).fixed();
-                                if (!v.getX().asBigInteger().equals(
-                                        points[d][w].getX().asBigInteger()) ||
-                                    !v.getY().asBigInteger().equals(
-                                        points[d][w].getY().asBigInteger())) {
-                                    throw new RuntimeException();
-                                }
-                            }
+                    if (w != 0) {
+                        byte[] s = new byte[32];
+                        byte[] b = bi.toByteArray();
+                        ArrayUtil.reverse(b);
+                        System.arraycopy(b, 0, s, 0, b.length);
+
+                        // Compare this multiplier to the table
+                        // (generated by Default multiplier)
+                        AffinePoint m = multiplier.pointMultiply(s).asAffine();
+                        AffinePoint v = points[d][w].asAffine();
+                        if (!m.equals(v)) {
+                            java.util.HexFormat hex = java.util.HexFormat.of();
+                            throw new RuntimeException(
+                                "Bad multiple found at [" +d+"]["+w+"]" +
+                                hex.formatHex(s) + " " + m.getX().asBigInteger()
+                            );
                         }
                     }
                 }
diff --git a/src/java.base/share/classes/sun/security/ec/point/AffinePoint.java b/src/java.base/share/classes/sun/security/ec/point/AffinePoint.java
index bc227b0babf..bc1530cd61b 100644
--- a/src/java.base/share/classes/sun/security/ec/point/AffinePoint.java
+++ b/src/java.base/share/classes/sun/security/ec/point/AffinePoint.java
@@ -26,6 +26,7 @@
 
 import sun.security.util.math.ImmutableIntegerModuloP;
 import sun.security.util.math.IntegerFieldModuloP;
+import sun.security.util.math.IntegerMontgomeryFieldModuloP;
 
 import java.security.spec.ECPoint;
 import java.util.Objects;
@@ -54,14 +55,30 @@ public static AffinePoint fromECPoint(
     }
 
     public ECPoint toECPoint() {
-        return new ECPoint(x.asBigInteger(), y.asBigInteger());
+        return new ECPoint(getX().asBigInteger(), getY().asBigInteger());
     }
 
     public ImmutableIntegerModuloP getX() {
+        return getX(true);
+    }
+
+    public ImmutableIntegerModuloP getX(boolean fieldCheck) {
+        IntegerFieldModuloP field = x.getField();
+        if (fieldCheck && field instanceof IntegerMontgomeryFieldModuloP) {
+            return ((IntegerMontgomeryFieldModuloP)field).fromMontgomery(x);
+        }
         return x;
     }
 
     public ImmutableIntegerModuloP getY() {
+        return getY(true);
+    }
+
+    public ImmutableIntegerModuloP getY(boolean fieldCheck) {
+        IntegerFieldModuloP field = y.getField();
+        if (fieldCheck && field instanceof IntegerMontgomeryFieldModuloP) {
+            return ((IntegerMontgomeryFieldModuloP)field).fromMontgomery(y);
+        }
         return y;
     }
 
@@ -71,8 +88,30 @@ public boolean equals(Object obj) {
             return false;
         }
         AffinePoint p = (AffinePoint) obj;
-        boolean xEquals = x.asBigInteger().equals(p.x.asBigInteger());
-        boolean yEquals = y.asBigInteger().equals(p.y.asBigInteger());
+        boolean xEquals, yEquals;
+        boolean thisMont = x.getField() instanceof IntegerMontgomeryFieldModuloP;
+        boolean objMont = p.x.getField() instanceof IntegerMontgomeryFieldModuloP;
+        if (thisMont ^ objMont == false) {
+            // both fields same
+            xEquals = x.asBigInteger().equals(p.x.asBigInteger());
+            yEquals = y.asBigInteger().equals(p.y.asBigInteger());
+        } else if (thisMont) {
+            // mismatched fields should not happen in production, but useful in
+            // testing
+            IntegerMontgomeryFieldModuloP field =
+                (IntegerMontgomeryFieldModuloP)x.getField();
+            xEquals = x.asBigInteger().equals(
+                field.getElement(p.x.asBigInteger()).asBigInteger());
+            yEquals = y.asBigInteger().equals(
+                field.getElement(p.y.asBigInteger()).asBigInteger());
+        } else {
+            IntegerMontgomeryFieldModuloP field =
+                (IntegerMontgomeryFieldModuloP)p.x.getField();
+            xEquals = field.getElement(
+                x.asBigInteger()).asBigInteger().equals(p.x.asBigInteger());
+            yEquals = field.getElement(
+                y.asBigInteger()).asBigInteger().equals(p.y.asBigInteger());
+        }
         return xEquals && yEquals;
     }
 
diff --git a/src/java.base/share/classes/sun/security/ec/point/ProjectivePoint.java b/src/java.base/share/classes/sun/security/ec/point/ProjectivePoint.java
index a3ebc532d46..fbb6681b724 100644
--- a/src/java.base/share/classes/sun/security/ec/point/ProjectivePoint.java
+++ b/src/java.base/share/classes/sun/security/ec/point/ProjectivePoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 package sun.security.ec.point;
 
 import sun.security.util.math.*;
+import jdk.internal.vm.annotation.ForceInline;
 
 /**
  * Elliptic curve point in projective coordinates (X, Y, Z) where
@@ -145,6 +146,7 @@ public Mutable conditionalSet(Point p, int set) {
             return conditionalSet(pp, set);
         }
 
+        @ForceInline
         private <T extends IntegerModuloP>
         Mutable conditionalSet(ProjectivePoint<T> pp, int set) {
 
@@ -157,9 +159,9 @@ Mutable conditionalSet(ProjectivePoint<T> pp, int set) {
 
         @Override
         public Mutable setValue(AffinePoint p) {
-            x.setValue(p.getX());
-            y.setValue(p.getY());
-            z.setValue(p.getX().getField().get1());
+            x.setValue(p.getX(false));
+            y.setValue(p.getY(false));
+            z.setValue(p.getX(false).getField().get1());
 
             return this;
         }
diff --git a/src/java.base/share/classes/sun/security/util/math/IntegerMontgomeryFieldModuloP.java b/src/java.base/share/classes/sun/security/util/math/IntegerMontgomeryFieldModuloP.java
new file mode 100644
index 00000000000..2987674a32b
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/math/IntegerMontgomeryFieldModuloP.java
@@ -0,0 +1,40 @@
+/*
+ * 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 sun.security.util.math;
+
+import java.math.BigInteger;
+
+/**
+ * An interface for the field of integers modulo a prime number. An
+ * implementation of this interface can be used to get properties of the
+ * field and to produce field elements of type ImmutableIntegerModuloP from
+ * other objects and representations of field elements.
+ */
+
+public interface IntegerMontgomeryFieldModuloP extends IntegerFieldModuloP {
+    ImmutableIntegerModuloP fromMontgomery(ImmutableIntegerModuloP m);
+    IntegerFieldModuloP residueField();
+}
diff --git a/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomial.java b/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomial.java
index 18ee87e0b24..05b4a71bebb 100644
--- a/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomial.java
+++ b/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomial.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,9 @@
 import java.nio.ByteOrder;
 import java.util.Arrays;
 
+import jdk.internal.vm.annotation.ForceInline;
+import jdk.internal.vm.annotation.IntrinsicCandidate;
+
 /**
  * A large number polynomial representation using sparse limbs of signed
  * long (64-bit) values. Limb values will always fit within a long, so inputs
@@ -62,10 +65,9 @@
 public abstract sealed class IntegerPolynomial implements IntegerFieldModuloP
     permits IntegerPolynomial1305, IntegerPolynomial25519,
             IntegerPolynomial448, IntegerPolynomialP256,
-            IntegerPolynomialP384, IntegerPolynomialP521,
-            IntegerPolynomialModBinP, P256OrderField,
-            P384OrderField, P521OrderField,
-            Curve25519OrderField,
+            MontgomeryIntegerPolynomialP256, IntegerPolynomialP384,
+            IntegerPolynomialP521, IntegerPolynomialModBinP, P256OrderField,
+            P384OrderField, P521OrderField, Curve25519OrderField,
             Curve448OrderField {
 
     protected static final BigInteger TWO = BigInteger.valueOf(2);
@@ -74,7 +76,8 @@ public abstract sealed class IntegerPolynomial implements IntegerFieldModuloP
     private final BigInteger modulus;
     protected final int bitsPerLimb;
     private final long[] posModLimbs;
-    private final int maxAdds;
+    private final int maxAddsMul; // max additions before a multiplication
+    private final int maxAddsAdd; // max additions before an addition
 
     /**
      * Reduce an IntegerPolynomial representation (a) and store the result
@@ -87,11 +90,12 @@ public abstract sealed class IntegerPolynomial implements IntegerFieldModuloP
      * store the result in an IntegerPolynomial representation in a. Requires
      * that a.length == numLimbs.
      */
-    protected void multByInt(long[] a, long b) {
+    protected int multByInt(long[] a, long b) {
         for (int i = 0; i < a.length; i++) {
             a[i] *= b;
         }
         reduce(a);
+        return 0;
     }
 
     /**
@@ -100,7 +104,7 @@ protected void multByInt(long[] a, long b) {
      * a.length == b.length == r.length == numLimbs. It is allowed for a and r
      * to be the same array.
      */
-    protected abstract void mult(long[] a, long[] b, long[] r);
+    protected abstract int mult(long[] a, long[] b, long[] r);
 
     /**
      * Multiply an IntegerPolynomial representation (a) with itself and store
@@ -108,19 +112,23 @@ protected void multByInt(long[] a, long b) {
      * a.length == r.length == numLimbs. It is allowed for a and r
      * to be the same array.
      */
-    protected abstract void square(long[] a, long[] r);
+    protected abstract int square(long[] a, long[] r);
 
     IntegerPolynomial(int bitsPerLimb,
                       int numLimbs,
-                      int maxAdds,
+                      int maxAddsMul,
                       BigInteger modulus) {
 
 
         this.numLimbs = numLimbs;
         this.modulus = modulus;
         this.bitsPerLimb = bitsPerLimb;
-        this.maxAdds = maxAdds;
-
+        this.maxAddsMul = maxAddsMul;
+        if (bitsPerLimb>32) {
+            this.maxAddsAdd = 64 - bitsPerLimb;
+        } else {
+            this.maxAddsAdd = 32 - bitsPerLimb;
+        }
         posModLimbs = setPosModLimbs();
     }
 
@@ -135,7 +143,7 @@ protected int getNumLimbs() {
     }
 
     public int getMaxAdds() {
-        return maxAdds;
+        return maxAddsMul;
     }
 
     @Override
@@ -327,10 +335,9 @@ private void setLimbsValue(BigInteger v, long[] limbs) {
     }
 
     protected void setLimbsValuePositive(BigInteger v, long[] limbs) {
-        assert bitsPerLimb < 32;
         long limbMask = (1L << bitsPerLimb) - 1;
         for (int i = 0; i < limbs.length; i++) {
-            limbs[i] = v.intValue() & limbMask;
+            limbs[i] = v.longValue() & limbMask;
             v = v.shiftRight(bitsPerLimb);
         }
     }
@@ -449,6 +456,8 @@ protected void addLimbs(long[] a, long[] b, long[] dst) {
      * will be unchanged. If set==1, then the values of b will be assigned to a.
      * The behavior is undefined if swap has any value other than 0 or 1.
      */
+    @ForceInline
+    @IntrinsicCandidate
     protected static void conditionalAssign(int set, long[] a, long[] b) {
         int maskValue = -set;
         for (int i = 0; i < a.length; i++) {
@@ -557,14 +566,12 @@ public ImmutableElement add(IntegerModuloP genB) {
             Element b = (Element)genB;
 
             // Reduce if required.
-            // if (numAdds >= maxAdds) {
-            if (numAdds > 32 - bitsPerLimb) {
+            if (numAdds > maxAddsAdd) {
                reduce(limbs);
                numAdds = 0;
             }
 
-            // if (b.numAdds >= maxAdds) {
-            if (b.numAdds > 32 - bitsPerLimb) {
+            if (b.numAdds > maxAddsAdd) {
                 reduce(b.limbs);
                 b.numAdds = 0;
             }
@@ -586,7 +593,7 @@ public ImmutableElement additiveInverse() {
                 newLimbs[i] = -limbs[i];
             }
 
-            return new ImmutableElement(newLimbs, numAdds);
+            return new ImmutableElement(newLimbs, numAdds+1);
         }
 
         protected long[] cloneLow(long[] limbs) {
@@ -604,32 +611,32 @@ public ImmutableElement multiply(IntegerModuloP genB) {
             Element b = (Element)genB;
 
             // Reduce if required.
-            if (numAdds > maxAdds) {
+            if (numAdds > maxAddsMul) {
                 reduce(limbs);
                 numAdds = 0;
             }
 
-            if (b.numAdds > maxAdds) {
+            if (b.numAdds > maxAddsMul) {
                 reduce(b.limbs);
                 b.numAdds = 0;
             }
 
             long[] newLimbs = new long[limbs.length];
-            mult(limbs, b.limbs, newLimbs);
-            return new ImmutableElement(newLimbs, 0);
+            int numAdds = mult(limbs, b.limbs, newLimbs);
+            return new ImmutableElement(newLimbs, numAdds);
         }
 
         @Override
         public ImmutableElement square() {
             // Reduce if required.
-            if (numAdds > maxAdds) {
+            if (numAdds > maxAddsMul) {
                 reduce(limbs);
                 numAdds = 0;
             }
 
             long[] newLimbs = new long[limbs.length];
-            IntegerPolynomial.this.square(limbs, newLimbs);
-            return new ImmutableElement(newLimbs, 0);
+            int numAdds = IntegerPolynomial.this.square(limbs, newLimbs);
+            return new ImmutableElement(newLimbs, numAdds);
         }
 
         public void addModPowerTwo(IntegerModuloP arg, byte[] result) {
@@ -637,12 +644,12 @@ public void addModPowerTwo(IntegerModuloP arg, byte[] result) {
             Element other = (Element)arg;
 
             // Reduce if required.
-            if (numAdds > 32 - bitsPerLimb) {
+            if (numAdds > maxAddsAdd) {
                 reduce(limbs);
                 numAdds = 0;
             }
 
-            if (other.numAdds > 32 - bitsPerLimb) {
+            if (other.numAdds > maxAddsAdd) {
                 reduce(other.limbs);
                 other.numAdds = 0;
             }
@@ -734,32 +741,30 @@ public MutableElement setProduct(IntegerModuloP genB) {
             Element b = (Element)genB;
 
             // Reduce if required.
-            if (numAdds > maxAdds) {
+            if (numAdds > maxAddsMul) {
                 reduce(limbs);
                 numAdds = 0;
             }
 
-            if (b.numAdds > maxAdds) {
+            if (b.numAdds > maxAddsMul) {
                 reduce(b.limbs);
                 b.numAdds = 0;
             }
 
-            mult(limbs, b.limbs, limbs);
-            numAdds = 0;
+            numAdds = mult(limbs, b.limbs, limbs);
             return this;
         }
 
         @Override
         public MutableElement setProduct(SmallValue v) {
             // Reduce if required.
-            if (numAdds > maxAdds) {
+            if (numAdds > maxAddsMul) {
                 reduce(limbs);
                 numAdds = 0;
             }
 
             int value = ((Limb)v).value;
-            multByInt(limbs, value);
-            numAdds = 0;
+            numAdds += multByInt(limbs, value);
             return this;
         }
 
@@ -769,14 +774,12 @@ public MutableElement setSum(IntegerModuloP genB) {
             Element b = (Element)genB;
 
             // Reduce if required.
-            // if (numAdds >= maxAdds) {
-            if (numAdds > 32 - bitsPerLimb) {
+            if (numAdds > maxAddsAdd) {
                reduce(limbs);
                numAdds = 0;
             }
 
-            // if (b.numAdds >= maxAdds) {
-            if (b.numAdds > 32 - bitsPerLimb) {
+            if (b.numAdds > maxAddsAdd) {
                 reduce(b.limbs);
                 b.numAdds = 0;
             }
@@ -795,14 +798,12 @@ public MutableElement setDifference(IntegerModuloP genB) {
             Element b = (Element)genB;
 
             // Reduce if required.
-            // if (numAdds >= maxAdds) {
-            if (numAdds > 32 - bitsPerLimb) {
+            if (numAdds > maxAddsAdd) {
                reduce(limbs);
                numAdds = 0;
             }
 
-            // if (b.numAdds >= maxAdds) {
-            if (b.numAdds > 32 - bitsPerLimb) {
+            if (b.numAdds > maxAddsAdd) {
                 reduce(b.limbs);
                 b.numAdds = 0;
             }
@@ -818,13 +819,12 @@ public MutableElement setDifference(IntegerModuloP genB) {
         @Override
         public MutableElement setSquare() {
             // Reduce if required.
-            if (numAdds > maxAdds) {
+            if (numAdds > maxAddsMul) {
                 reduce(limbs);
                 numAdds = 0;
             }
 
-            IntegerPolynomial.this.square(limbs, limbs);
-            numAdds = 0;
+            numAdds = IntegerPolynomial.this.square(limbs, limbs);;
             return this;
         }
 
@@ -833,6 +833,7 @@ public MutableElement setAdditiveInverse() {
             for (int i = 0; i < limbs.length; i++) {
                 limbs[i] = -limbs[i];
             }
+            numAdds++;
             return this;
         }
     }
diff --git a/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomial1305.java b/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomial1305.java
index 5015d186d37..706651330d3 100644
--- a/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomial1305.java
+++ b/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomial1305.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@ private IntegerPolynomial1305() {
         super(BITS_PER_LIMB, NUM_LIMBS, 1, MODULUS);
     }
 
-    protected void mult(long[] a, long[] b, long[] r) {
+    protected int mult(long[] a, long[] b, long[] r) {
 
         // Use grade-school multiplication into primitives to avoid the
         // temporary array allocation. This is equivalent to the following
@@ -73,6 +73,7 @@ protected void mult(long[] a, long[] b, long[] r) {
         long c8 = (a[4] * b[4]);
 
         carryReduce(r, c0, c1, c2, c3, c4, c5, c6, c7, c8);
+        return 0;
     }
 
     private void carryReduce(long[] r, long c0, long c1, long c2, long c3,
@@ -99,7 +100,7 @@ private void carryReduce(long[] r, long c0, long c1, long c2, long c3,
     }
 
     @Override
-    protected void square(long[] a, long[] r) {
+    protected int square(long[] a, long[] r) {
         // Use grade-school multiplication with a simple squaring optimization.
         // Multiply into primitives to avoid the temporary array allocation.
         // This is equivalent to the following code:
@@ -122,6 +123,7 @@ protected void square(long[] a, long[] r) {
         long c8 = (a[4] * a[4]);
 
         carryReduce(r, c0, c1, c2, c3, c4, c5, c6, c7, c8);
+        return 0;
     }
 
     @Override
diff --git a/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomialModBinP.java b/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomialModBinP.java
index c6e58322d7c..e57316ed964 100644
--- a/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomialModBinP.java
+++ b/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomialModBinP.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -131,11 +131,12 @@ private void multOnly(long[] a, long[] b, long[] c) {
     }
 
     @Override
-    protected void mult(long[] a, long[] b, long[] r) {
+    protected int mult(long[] a, long[] b, long[] r) {
 
         long[] c = new long[2 * numLimbs];
         multOnly(a, b, c);
         carryReduce(c, r);
+        return 0;
     }
 
     private void modReduceInBits(long[] limbs, int index, int bits, long x) {
@@ -188,7 +189,7 @@ protected void reduce(long[] a) {
     }
 
     @Override
-    protected void square(long[] a, long[] r) {
+    protected int square(long[] a, long[] r) {
 
         long[] c = new long[2 * numLimbs];
         for (int i = 0; i < numLimbs; i++) {
@@ -199,7 +200,7 @@ protected void square(long[] a, long[] r) {
         }
 
         carryReduce(c, r);
-
+        return 0;
     }
 
     /**
diff --git a/src/java.base/share/classes/sun/security/util/math/intpoly/MontgomeryIntegerPolynomialP256.java b/src/java.base/share/classes/sun/security/util/math/intpoly/MontgomeryIntegerPolynomialP256.java
new file mode 100644
index 00000000000..d4c0348eb9d
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/math/intpoly/MontgomeryIntegerPolynomialP256.java
@@ -0,0 +1,560 @@
+/*
+ * 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 sun.security.util.math.intpoly;
+
+import sun.security.util.math.ImmutableIntegerModuloP;
+import sun.security.util.math.IntegerMontgomeryFieldModuloP;
+import sun.security.util.math.SmallValue;
+import sun.security.util.math.IntegerFieldModuloP;
+import java.lang.Math;
+import java.math.BigInteger;
+import jdk.internal.vm.annotation.IntrinsicCandidate;
+
+// Reference:
+// - [1] Shay Gueron and Vlad Krasnov "Fast Prime Field Elliptic Curve
+//       Cryptography with 256 Bit Primes"
+//
+public final class MontgomeryIntegerPolynomialP256 extends IntegerPolynomial
+        implements IntegerMontgomeryFieldModuloP {
+    private static final int BITS_PER_LIMB = 52;
+    private static final int NUM_LIMBS = 5;
+    private static final int MAX_ADDS = 0;
+    public static final BigInteger MODULUS = evaluateModulus();
+    private static final long LIMB_MASK = -1L >>> (64 - BITS_PER_LIMB);
+
+    public static final MontgomeryIntegerPolynomialP256 ONE = new MontgomeryIntegerPolynomialP256();
+
+    // h = 2^(2*260)%p = 0x4fffffffdfffffffffffffffefffffffbffffffff000000000000000300
+    // oneActual = 1
+    // oneMont = (1*2^260) mod p
+    // modulus = p
+    private static final long[] h = new long[] {
+        0x0000000000000300L, 0x000ffffffff00000L, 0x000ffffefffffffbL,
+        0x000fdfffffffffffL, 0x0000000004ffffffL };
+    private static final long[] oneActual = new long[] {
+        0x0000000000000001L, 0x0000000000000000L, 0x0000000000000000L,
+        0x0000000000000000L, 0x0000000000000000L };
+    private static final long[] oneMont = new long[] {
+        0x0000000000000010L, 0x000f000000000000L, 0x000fffffffffffffL,
+        0x000ffeffffffffffL, 0x00000000000fffffL };
+    private static final long[] zero = new long[] {
+        0x0000000000000000L, 0x0000000000000000L, 0x0000000000000000L,
+        0x0000000000000000L, 0x0000000000000000L };
+    private static final long[] modulus = new long[] {
+        0x000fffffffffffffL, 0x00000fffffffffffL, 0x0000000000000000L,
+        0x0000001000000000L, 0x0000ffffffff0000L };
+
+    private MontgomeryIntegerPolynomialP256() {
+        super(BITS_PER_LIMB, NUM_LIMBS, MAX_ADDS, MODULUS);
+    }
+
+    public IntegerFieldModuloP residueField() {
+        return IntegerPolynomialP256.ONE;
+    }
+
+    // (224%nat,-1)::(192%nat,1)::(96%nat,1)::(0%nat,-1)::nil.
+    private static BigInteger evaluateModulus() {
+        BigInteger result = BigInteger.valueOf(2).pow(256);
+        result = result.subtract(BigInteger.valueOf(1).shiftLeft(224));
+        result = result.add(BigInteger.valueOf(1).shiftLeft(192));
+        result = result.add(BigInteger.valueOf(1).shiftLeft(96));
+        result = result.subtract(BigInteger.valueOf(1));
+        return result;
+    }
+
+    @Override
+    public ImmutableElement get0() {
+        return new ImmutableElement(zero, 0);
+    }
+
+    // One in montgomery domain: (1*2^260) mod p
+    @Override
+    public ImmutableElement get1() {
+        return new ImmutableElement(oneMont, 0);
+    }
+
+    // Convert v to Montgomery domain
+    @Override
+    public ImmutableElement getElement(BigInteger v) {
+        long[] vLimbs = new long[NUM_LIMBS];
+        long[] montLimbs = new long[NUM_LIMBS];
+        setLimbsValuePositive(v, vLimbs);
+
+        // Convert to Montgomery domain
+        int numAdds = mult(vLimbs, h, montLimbs);
+        return new ImmutableElement(montLimbs, numAdds);
+    }
+
+    @Override
+    public SmallValue getSmallValue(int value) {
+        // Explicitely here as reminder that SmallValue stays in residue domain
+        // See multByInt below for how this is used
+        return super.getSmallValue(value);
+    }
+
+    /*
+     * This function is used by IntegerPolynomial.setProduct(SmallValue v) to
+     * multiply by a small constant (i.e. (int) 1,2,3,4). Instead of doing a
+     * montgomery conversion followed by a montgomery multiplication, just use
+     * the spare top (64-BITS_PER_LIMB) bits to multiply by a constant. (See [1]
+     * Section 4 )
+     *
+     * Will return an unreduced value
+     */
+    @Override
+    protected int multByInt(long[] a, long b) {
+        assert (b < (1 << BITS_PER_LIMB));
+        for (int i = 0; i < a.length; i++) {
+            a[i] *= b;
+        }
+        return (int) (b - 1);
+    }
+
+    @Override
+    public ImmutableIntegerModuloP fromMontgomery(ImmutableIntegerModuloP n) {
+        assert n.getField() == MontgomeryIntegerPolynomialP256.ONE;
+
+        ImmutableElement nn = (ImmutableElement) n;
+        long[] r1 = new long[NUM_LIMBS];
+        long[] r2 = new long[2 * NUM_LIMBS];
+        long[] limbs = nn.getLimbs();
+        reduce(limbs);
+        MontgomeryIntegerPolynomialP256.ONE.mult(limbs, oneActual, r1);
+        reduce(r1);
+        halfLimbs(r1, r2);
+        return IntegerPolynomialP256.ONE.new ImmutableElement(r2, 0);
+    }
+
+    private void halfLimbs(long[] a, long[] r) {
+        final long HALF_BITS_LIMB = BITS_PER_LIMB / 2;
+        final long HALF_LIMB_MASK = -1L >>> (64 - HALF_BITS_LIMB);
+        r[0] = a[0] & HALF_LIMB_MASK;
+        r[1] = a[0] >> HALF_BITS_LIMB;
+        r[2] = a[1] & HALF_LIMB_MASK;
+        r[3] = a[1] >> HALF_BITS_LIMB;
+        r[4] = a[2] & HALF_LIMB_MASK;
+        r[5] = a[2] >> HALF_BITS_LIMB;
+        r[6] = a[3] & HALF_LIMB_MASK;
+        r[7] = a[3] >> HALF_BITS_LIMB;
+        r[8] = a[4] & HALF_LIMB_MASK;
+        r[9] = a[4] >> HALF_BITS_LIMB;
+    }
+
+    @Override
+    protected int square(long[] a, long[] r) {
+        return mult(a, a, r);
+    }
+
+    /**
+     * Unrolled Word-by-Word Montgomery Multiplication r = a * b * 2^-260 (mod P)
+     *
+     * See [1] Figure 5. "Algorithm 2: Word-by-Word Montgomery Multiplication
+     * for a Montgomery Friendly modulus p". Note: Step 6. Skipped; Instead use
+     * numAdds to reuse existing overflow logic.
+     */
+    @IntrinsicCandidate
+    protected int mult(long[] a, long[] b, long[] r) {
+        long aa0 = a[0];
+        long aa1 = a[1];
+        long aa2 = a[2];
+        long aa3 = a[3];
+        long aa4 = a[4];
+
+        long bb0 = b[0];
+        long bb1 = b[1];
+        long bb2 = b[2];
+        long bb3 = b[3];
+        long bb4 = b[4];
+
+        final long shift1 = 64 - BITS_PER_LIMB; // 12
+        final long shift2 = BITS_PER_LIMB; // 40
+
+        long d0, d1, d2, d3, d4;      // low digits from multiplication
+        long dd0, dd1, dd2, dd3, dd4; // high digits from multiplication
+        long n, n0, n1, n2, n3, n4,
+            nn0, nn1, nn2, nn3, nn4; // modulus multiple digits
+        long c0, c1, c2, c3, c4, c5, c6, c7, c8, c9; // multiplication result
+                                                     // digits for each column
+
+        // Row 0 - multiply by aa0 and reduce out c0
+        d0 = aa0 * bb0;
+        dd0 = Math.unsignedMultiplyHigh(aa0, bb0) << shift1 | (d0 >>> shift2);
+        d0 &= LIMB_MASK;
+        n = d0;
+        d1 = aa0 * bb1;
+        dd1 = Math.unsignedMultiplyHigh(aa0, bb1) << shift1 | (d1 >>> shift2);
+        d1 &= LIMB_MASK;
+        d2 = aa0 * bb2;
+        dd2 = Math.unsignedMultiplyHigh(aa0, bb2) << shift1 | (d2 >>> shift2);
+        d2 &= LIMB_MASK;
+        d3 = aa0 * bb3;
+        dd3 = Math.unsignedMultiplyHigh(aa0, bb3) << shift1 | (d3 >>> shift2);
+        d3 &= LIMB_MASK;
+        d4 = aa0 * bb4;
+        dd4 = Math.unsignedMultiplyHigh(aa0, bb4) << shift1 | (d4 >>> shift2);
+        d4 &= LIMB_MASK;
+
+        n0 = n * modulus[0];
+        nn0 = Math.unsignedMultiplyHigh(n, modulus[0]) << shift1 | (n0 >>> shift2);
+        n0 &= LIMB_MASK;
+        n1 = n * modulus[1];
+        nn1 = Math.unsignedMultiplyHigh(n, modulus[1]) << shift1 | (n1 >>> shift2);
+        n1 &= LIMB_MASK;
+        n2 = n * modulus[2];
+        nn2 = Math.unsignedMultiplyHigh(n, modulus[2]) << shift1 | (n2 >>> shift2);
+        n2 &= LIMB_MASK;
+        n3 = n * modulus[3];
+        nn3 = Math.unsignedMultiplyHigh(n, modulus[3]) << shift1 | (n3 >>> shift2);
+        n3 &= LIMB_MASK;
+        n4 = n * modulus[4];
+        nn4 = Math.unsignedMultiplyHigh(n, modulus[4]) << shift1 | (n4 >>> shift2);
+        n4 &= LIMB_MASK;
+
+        dd0 += nn0;
+        d0 += n0;
+        dd1 += nn1;
+        d1 += n1;
+        dd2 += nn2;
+        d2 += n2;
+        dd3 += nn3;
+        d3 += n3;
+        dd4 += nn4;
+        d4 += n4;
+
+        c1 = d1 + dd0 + (d0 >>> BITS_PER_LIMB);
+        c2 = d2 + dd1;
+        c3 = d3 + dd2;
+        c4 = d4 + dd3;
+        c5 = dd4;
+
+        // Row 1 - multiply by aa1 and reduce out c1
+        d0 = aa1 * bb0;
+        dd0 = Math.unsignedMultiplyHigh(aa1, bb0) << shift1 | (d0 >>> shift2);
+        d0 &= LIMB_MASK;
+        d0 += c1;
+        n = d0 & LIMB_MASK;
+        d1 = aa1 * bb1;
+        dd1 = Math.unsignedMultiplyHigh(aa1, bb1) << shift1 | (d1 >>> shift2);
+        d1 &= LIMB_MASK;
+        d2 = aa1 * bb2;
+        dd2 = Math.unsignedMultiplyHigh(aa1, bb2) << shift1 | (d2 >>> shift2);
+        d2 &= LIMB_MASK;
+        d3 = aa1 * bb3;
+        dd3 = Math.unsignedMultiplyHigh(aa1, bb3) << shift1 | (d3 >>> shift2);
+        d3 &= LIMB_MASK;
+        d4 = aa1 * bb4;
+        dd4 = Math.unsignedMultiplyHigh(aa1, bb4) << shift1 | (d4 >>> shift2);
+        d4 &= LIMB_MASK;
+
+        n0 = n * modulus[0];
+        dd0 += Math.unsignedMultiplyHigh(n, modulus[0]) << shift1 | (n0 >>> shift2);
+        d0 += n0 & LIMB_MASK;
+        n1 = n * modulus[1];
+        dd1 += Math.unsignedMultiplyHigh(n, modulus[1]) << shift1 | (n1 >>> shift2);
+        d1 += n1 & LIMB_MASK;
+        n2 = n * modulus[2];
+        dd2 += Math.unsignedMultiplyHigh(n, modulus[2]) << shift1 | (n2 >>> shift2);
+        d2 += n2 & LIMB_MASK;
+        n3 = n * modulus[3];
+        dd3 += Math.unsignedMultiplyHigh(n, modulus[3]) << shift1 | (n3 >>> shift2);
+        d3 += n3 & LIMB_MASK;
+        n4 = n * modulus[4];
+        dd4 += Math.unsignedMultiplyHigh(n, modulus[4]) << shift1 | (n4 >>> shift2);
+        d4 += n4 & LIMB_MASK;
+
+        c2 += d1 + dd0 + (d0 >>> BITS_PER_LIMB);
+        c3 += d2 + dd1;
+        c4 += d3 + dd2;
+        c5 += d4 + dd3;
+        c6 = dd4;
+
+        // Row 2 - multiply by aa2 and reduce out c2
+        d0 = aa2 * bb0;
+        dd0 = Math.unsignedMultiplyHigh(aa2, bb0) << shift1 | (d0 >>> shift2);
+        d0 &= LIMB_MASK;
+        d0 += c2;
+        n = d0 & LIMB_MASK;
+        d1 = aa2 * bb1;
+        dd1 = Math.unsignedMultiplyHigh(aa2, bb1) << shift1 | (d1 >>> shift2);
+        d1 &= LIMB_MASK;
+        d2 = aa2 * bb2;
+        dd2 = Math.unsignedMultiplyHigh(aa2, bb2) << shift1 | (d2 >>> shift2);
+        d2 &= LIMB_MASK;
+        d3 = aa2 * bb3;
+        dd3 = Math.unsignedMultiplyHigh(aa2, bb3) << shift1 | (d3 >>> shift2);
+        d3 &= LIMB_MASK;
+        d4 = aa2 * bb4;
+        dd4 = Math.unsignedMultiplyHigh(aa2, bb4) << shift1 | (d4 >>> shift2);
+        d4 &= LIMB_MASK;
+
+        n0 = n * modulus[0];
+        dd0 += Math.unsignedMultiplyHigh(n, modulus[0]) << shift1 | (n0 >>> shift2);
+        d0 += n0 & LIMB_MASK;
+        n1 = n * modulus[1];
+        dd1 += Math.unsignedMultiplyHigh(n, modulus[1]) << shift1 | (n1 >>> shift2);
+        d1 += n1 & LIMB_MASK;
+        n2 = n * modulus[2];
+        dd2 += Math.unsignedMultiplyHigh(n, modulus[2]) << shift1 | (n2 >>> shift2);
+        d2 += n2 & LIMB_MASK;
+        n3 = n * modulus[3];
+        dd3 += Math.unsignedMultiplyHigh(n, modulus[3]) << shift1 | (n3 >>> shift2);
+        d3 += n3 & LIMB_MASK;
+        n4 = n * modulus[4];
+        dd4 += Math.unsignedMultiplyHigh(n, modulus[4]) << shift1 | (n4 >>> shift2);
+        d4 += n4 & LIMB_MASK;
+
+        c3 += d1 + dd0 + (d0 >>> BITS_PER_LIMB);
+        c4 += d2 + dd1;
+        c5 += d3 + dd2;
+        c6 += d4 + dd3;
+        c7 = dd4;
+
+        // Row 3 - multiply by aa3 and reduce out c3
+        d0 = aa3 * bb0;
+        dd0 = Math.unsignedMultiplyHigh(aa3, bb0) << shift1 | (d0 >>> shift2);
+        d0 &= LIMB_MASK;
+        d0 += c3;
+        n = d0 & LIMB_MASK;
+        d1 = aa3 * bb1;
+        dd1 = Math.unsignedMultiplyHigh(aa3, bb1) << shift1 | (d1 >>> shift2);
+        d1 &= LIMB_MASK;
+        d2 = aa3 * bb2;
+        dd2 = Math.unsignedMultiplyHigh(aa3, bb2) << shift1 | (d2 >>> shift2);
+        d2 &= LIMB_MASK;
+        d3 = aa3 * bb3;
+        dd3 = Math.unsignedMultiplyHigh(aa3, bb3) << shift1 | (d3 >>> shift2);
+        d3 &= LIMB_MASK;
+        d4 = aa3 * bb4;
+        dd4 = Math.unsignedMultiplyHigh(aa3, bb4) << shift1 | (d4 >>> shift2);
+        d4 &= LIMB_MASK;
+
+        n0 = n * modulus[0];
+        dd0 += Math.unsignedMultiplyHigh(n, modulus[0]) << shift1 | (n0 >>> shift2);
+        d0 += n0 & LIMB_MASK;
+        n1 = n * modulus[1];
+        dd1 += Math.unsignedMultiplyHigh(n, modulus[1]) << shift1 | (n1 >>> shift2);
+        d1 += n1 & LIMB_MASK;
+        n2 = n * modulus[2];
+        dd2 += Math.unsignedMultiplyHigh(n, modulus[2]) << shift1 | (n2 >>> shift2);
+        d2 += n2 & LIMB_MASK;
+        n3 = n * modulus[3];
+        dd3 += Math.unsignedMultiplyHigh(n, modulus[3]) << shift1 | (n3 >>> shift2);
+        d3 += n3 & LIMB_MASK;
+        n4 = n * modulus[4];
+        dd4 += Math.unsignedMultiplyHigh(n, modulus[4]) << shift1 | (n4 >>> shift2);
+        d4 += n4 & LIMB_MASK;
+
+        c4 += d1 + dd0 + (d0 >>> BITS_PER_LIMB);
+        c5 += d2 + dd1;
+        c6 += d3 + dd2;
+        c7 += d4 + dd3;
+        c8 = dd4;
+
+        // Row 4 - multiply by aa3 and reduce out c4
+        d0 = aa4 * bb0;
+        dd0 = Math.unsignedMultiplyHigh(aa4, bb0) << shift1 | (d0 >>> shift2);
+        d0 &= LIMB_MASK;
+        d0 += c4;
+        n = d0 & LIMB_MASK;
+        d1 = aa4 * bb1;
+        dd1 = Math.unsignedMultiplyHigh(aa4, bb1) << shift1 | (d1 >>> shift2);
+        d1 &= LIMB_MASK;
+        d2 = aa4 * bb2;
+        dd2 = Math.unsignedMultiplyHigh(aa4, bb2) << shift1 | (d2 >>> shift2);
+        d2 &= LIMB_MASK;
+        d3 = aa4 * bb3;
+        dd3 = Math.unsignedMultiplyHigh(aa4, bb3) << shift1 | (d3 >>> shift2);
+        d3 &= LIMB_MASK;
+        d4 = aa4 * bb4;
+        dd4 = Math.unsignedMultiplyHigh(aa4, bb4) << shift1 | (d4 >>> shift2);
+        d4 &= LIMB_MASK;
+
+        n0 = n * modulus[0];
+        dd0 += Math.unsignedMultiplyHigh(n, modulus[0]) << shift1 | (n0 >>> shift2);
+        d0 += n0 & LIMB_MASK;
+        n1 = n * modulus[1];
+        dd1 += Math.unsignedMultiplyHigh(n, modulus[1]) << shift1 | (n1 >>> shift2);
+        d1 += n1 & LIMB_MASK;
+        n2 = n * modulus[2];
+        dd2 += Math.unsignedMultiplyHigh(n, modulus[2]) << shift1 | (n2 >>> shift2);
+        d2 += n2 & LIMB_MASK;
+        n3 = n * modulus[3];
+        dd3 += Math.unsignedMultiplyHigh(n, modulus[3]) << shift1 | (n3 >>> shift2);
+        d3 += n3 & LIMB_MASK;
+        n4 = n * modulus[4];
+        dd4 += Math.unsignedMultiplyHigh(n, modulus[4]) << shift1 | (n4 >>> shift2);
+        d4 += n4 & LIMB_MASK;
+
+        c5 += d1 + dd0 + (d0 >>> BITS_PER_LIMB);
+        c6 += d2 + dd1 + (c5 >>> BITS_PER_LIMB);
+        c7 += d3 + dd2 + (c6 >>> BITS_PER_LIMB);
+        c8 += d4 + dd3 + (c7 >>> BITS_PER_LIMB);
+        c9 = dd4 + (c8 >>> BITS_PER_LIMB);
+
+        c5 &= LIMB_MASK;
+        c6 &= LIMB_MASK;
+        c7 &= LIMB_MASK;
+        c8 &= LIMB_MASK;
+
+        // At this point, the result could overflow by one modulus.
+        c0 = c5 - modulus[0];
+        c1 = c6 - modulus[1] + (c0 >> BITS_PER_LIMB);
+        c0 &= LIMB_MASK;
+        c2 = c7 - modulus[2] + (c1 >> BITS_PER_LIMB);
+        c1 &= LIMB_MASK;
+        c3 = c8 - modulus[3] + (c2 >> BITS_PER_LIMB);
+        c2 &= LIMB_MASK;
+        c4 = c9 - modulus[4] + (c3 >> BITS_PER_LIMB);
+        c3 &= LIMB_MASK;
+
+        long mask = c4 >> BITS_PER_LIMB; // Signed shift!
+
+        r[0] = ((c5 & mask) | (c0 & ~mask));
+        r[1] = ((c6 & mask) | (c1 & ~mask));
+        r[2] = ((c7 & mask) | (c2 & ~mask));
+        r[3] = ((c8 & mask) | (c3 & ~mask));
+        r[4] = ((c9 & mask) | (c4 & ~mask));
+
+        return 0;
+    }
+
+    @Override
+    protected void finalCarryReduceLast(long[] limbs) {
+        reduce(limbs);
+    }
+
+    @Override
+    protected long carryValue(long x) {
+        return x >> BITS_PER_LIMB;
+    }
+
+    @Override
+    protected void postEncodeCarry(long[] v) {
+        // not needed because carry is unsigned
+    }
+
+    // Proof:
+    // carry * 2^256 (mod p) ==  carry * [2^256 - p] (mod p)
+    //                       ==  carry * [2^256 - (2^256 -2^224 +2^192 +2^96 -1)] (mod p)
+    //                       ==  carry * [2^224 -2^192 -2^96 +1] (mod p)
+    @Override
+    protected void reduce(long[] limbs) {
+        long b0 = limbs[0];
+        long b1 = limbs[1];
+        long b2 = limbs[2];
+        long b3 = limbs[3];
+        long b4 = limbs[4];
+        long carry = b4 >> 48; // max 16-bits
+        b4 -= carry << 48;
+
+        // 2^0 position
+        b0 += carry;
+        // -2^96
+        b1 -= carry << 44;
+        // -2^192
+        b3 -= carry << 36;
+        // 2^224
+        b4 += carry << 16;
+
+        b1 += b0 >> BITS_PER_LIMB;
+        b2 += b1 >> BITS_PER_LIMB;
+        b3 += b2 >> BITS_PER_LIMB;
+        b4 += b3 >> BITS_PER_LIMB;
+
+        b0 &= LIMB_MASK;
+        b1 &= LIMB_MASK;
+        b2 &= LIMB_MASK;
+        b3 &= LIMB_MASK;
+
+        long c0, c1, c2, c3, c4;
+        c0 = modulus[0] + b0;
+        c1 = modulus[1] + b1 + (c0 >> BITS_PER_LIMB);
+        c0 &= LIMB_MASK;
+        c2 = modulus[2] + b2 + (c1 >> BITS_PER_LIMB);
+        c1 &= LIMB_MASK;
+        c3 = modulus[3] + b3 + (c2 >> BITS_PER_LIMB);
+        c2 &= LIMB_MASK;
+        c4 = modulus[4] + b4 + (c3 >> BITS_PER_LIMB);
+        c3 &= LIMB_MASK;
+
+        long mask = b4 >> BITS_PER_LIMB; // Signed shift!
+
+        limbs[0] = (b0 & ~mask) | (c0 & mask);
+        limbs[1] = (b1 & ~mask) | (c1 & mask);
+        limbs[2] = (b2 & ~mask) | (c2 & mask);
+        limbs[3] = (b3 & ~mask) | (c3 & mask);
+        limbs[4] = (b4 & ~mask) | (c4 & mask);
+    }
+
+    public ImmutableElement getElement(byte[] v, int offset, int length,
+            byte highByte) {
+
+        long[] vLimbs = new long[NUM_LIMBS];
+        long[] montLimbs = new long[NUM_LIMBS];
+        super.encode(v, offset, length, highByte, vLimbs);
+
+        // Convert to Montgomery domain
+        int numAdds = mult(vLimbs, h, montLimbs);
+        return new ImmutableElement(montLimbs, numAdds);
+    }
+
+    /*
+     * This function 'moves/reduces' digit 'v' to the 'lower' limbs
+     *
+     * The result is not reduced further. Carry propagation is not performed
+     * (see IntegerPolynomial.reduceHigh() for how this method is used)
+     *
+     * Proof:
+     *   v * 2^(i*52) (mod p) ==  v * 2^(52i) - v * 2^(52i-256) * p                               (mod p)
+     *                        ==  v * 2^(52i) - v * 2^(52i-256) * (2^256 -2^224 +2^192 +2^96 -1)  (mod p)
+     *                        ==  v * 2^(52i) - v * [2^(52i-256+256) -2^(52i-256+224) +2^(52i-256+192) +2^(52i-256+96) -2^(52i-256)] (mod p)
+     *                        ==  v * 2^(52i) - v * [2^(52i) -2^(52i-32) +2^(52i-64) +2^(52i-160) -2^(52i-256)]                      (mod p)
+     *
+     *                        ==  v * [2^(52i-32) +2^(52i-52-12) +2^(52i-3*52-4) -2^(52i-4*52-48)] (mod p)
+     */
+    @Override
+    protected void reduceIn(long[] limbs, long v, int i) {
+        // Since top term (2^(52i-32)) will leave top 20 bits back in the same
+        // position i,
+        // "repeat same reduction on top 20 bits"
+        v += v >> 32;
+
+        // 2^(52i-32)
+        limbs[i - 1] += (v << 20) & LIMB_MASK;
+
+        // 2^(52i-52-12)
+        limbs[i - 2] -= (v << 40) & LIMB_MASK;
+        limbs[i - 1] -= v >> 12;
+
+        // 2^(52i-3*52-4)
+        limbs[i - 4] -= (v << 48) & LIMB_MASK;
+        limbs[i - 3] -= v >> 4;
+
+        // 2^(52i-4*52-48)
+        limbs[i - 5] += (v << 4) & LIMB_MASK;
+        limbs[i - 4] += v >> 48;
+    }
+}
\ No newline at end of file
diff --git a/src/java.base/share/data/cacerts/globalsigne46 b/src/java.base/share/data/cacerts/globalsigne46
new file mode 100644
index 00000000000..50c7dadefdd
--- /dev/null
+++ b/src/java.base/share/data/cacerts/globalsigne46
@@ -0,0 +1,20 @@
+Owner: CN=GlobalSign Root E46, O=GlobalSign nv-sa, C=BE
+Issuer: CN=GlobalSign Root E46, O=GlobalSign nv-sa, C=BE
+Serial number: 11d2bbba336ed4bce62468c50d841d98e843
+Valid from: Wed Mar 20 00:00:00 GMT 2019 until: Tue Mar 20 00:00:00 GMT 2046
+Signature algorithm name: SHA384withECDSA
+Subject Public Key Algorithm: 384-bit EC (secp384r1) key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIICCzCCAZGgAwIBAgISEdK7ujNu1LzmJGjFDYQdmOhDMAoGCCqGSM49BAMDMEYx
+CzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQD
+ExNHbG9iYWxTaWduIFJvb3QgRTQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMyMDAw
+MDAwMFowRjELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2Ex
+HDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBFNDYwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAAScDrHPt+ieUnd1NPqlRqetMhkytAepJ8qUuwzSChDH2omwlwxwEwkBjtjq
+R+q+soArzfwoDdusvKSGN+1wCAB16pMLey5SnCNoIwZD7JIvU4Tb+0cUB+hflGdd
+yXqBPCCjQjBAMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
+DgQWBBQxCpCPtsad0kRLgLWi5h+xEk8blTAKBggqhkjOPQQDAwNoADBlAjEA31SQ
+7Zvvi5QCkxeCmb6zniz2C5GMn0oUsfZkvLtoURMMA/cVi4RguYv/Uo7njLwcAjA8
++RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+CAezNIm8BZ/3Hobui3A=
+-----END CERTIFICATE-----
diff --git a/src/java.base/share/data/cacerts/globalsignr46 b/src/java.base/share/data/cacerts/globalsignr46
new file mode 100644
index 00000000000..80d7d92d4fb
--- /dev/null
+++ b/src/java.base/share/data/cacerts/globalsignr46
@@ -0,0 +1,38 @@
+Owner: CN=GlobalSign Root R46, O=GlobalSign nv-sa, C=BE
+Issuer: CN=GlobalSign Root R46, O=GlobalSign nv-sa, C=BE
+Serial number: 11d2bbb9d723189e405f0a9d2dd0df2567d1
+Valid from: Wed Mar 20 00:00:00 GMT 2019 until: Tue Mar 20 00:00:00 GMT 2046
+Signature algorithm name: SHA384withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgISEdK7udcjGJ5AXwqdLdDfJWfRMA0GCSqGSIb3DQEBDAUA
+MEYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYD
+VQQDExNHbG9iYWxTaWduIFJvb3QgUjQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMy
+MDAwMDAwMFowRjELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYt
+c2ExHDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBSNDYwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQCsrHQy6LNl5brtQyYdpokNRbopiLKkHWPd08EsCVeJ
+OaFV6Wc0dwxu5FUdUiXSE2te4R2pt32JMl8Nnp8semNgQB+msLZ4j5lUlghYruQG
+vGIFAha/r6gjA7aUD7xubMLL1aa7DOn2wQL7Id5m3RerdELv8HQvJfTqa1VbkNud
+316HCkD7rRlr+/fKYIje2sGP1q7Vf9Q8g+7XFkyDRTNrJ9CG0Bwta/OrffGFqfUo
+0q3v84RLHIf8E6M6cqJaESvWJ3En7YEtbWaBkoe0G1h6zD8K+kZPTXhc+CtI4wSE
+y132tGqzZfxCnlEmIyDLPRT5ge1lFgBPGmSXZgjPjHvjK8Cd+RTyG/FWaha/LIWF
+zXg4mutCagI0GIMXTpRW+LaCtfOW3T3zvn8gdz57GSNrLNRyc0NXfeD412lPFzYE
++cCQYDdF3uYM2HSNrpyibXRdQr4G9dlkbgIQrImwTDsHTUB+JMWKmIJ5jqSngiCN
+I/onccnfxkF0oE32kRbcRoxfKWMxWXEM2G/CtjJ9++ZdU6Z+Ffy7dXxd7Pj2Fxzs
+x2sZy/N78CsHpdlseVR2bJ0cpm4O6XkMqCNqo98bMDGfsVR7/mrLZqrcZdCinkqa
+ByFrgY/bxFn63iLABJzjqls2k+g9vXqhnQt2sQvHnf3PmKgGwvgqo6GDoLclcqUC
+4wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
+HQ4EFgQUA1yrc4GHqMywptWU4jaWSf8FmSwwDQYJKoZIhvcNAQEMBQADggIBAHx4
+7PYCLLtbfpIrXTncvtgdokIzTfnvpCo7RGkerNlFo048p9gkUbJUHJNOxO97k4Vg
+JuoJSOD1u8fpaNK7ajFxzHmuEajwmf3lH7wvqMxX63bEIaZHU1VNaL8FpO7XJqti
+2kM3S+LGteWygxk6x9PbTZ4IevPuzz5i+6zoYMzRx6Fcg0XERczzF2sUyQQCPtIk
+pnnpHs6i58FZFZ8d4kuaPp92CC1r2LpXFNqD6v6MVenQTqnMdzGxRBF6XLE+0xRF
+FRhiJBPSy03OXIPBNvIQtQ6IbbjhVp+J3pZmOUdkLG5NrmJ7v2B0GbhWrJKsFjLt
+rWhV/pi60zTe9Mlhww6G9kuEYO4Ne7UyWHmRVSyBQ7N0H3qqJZ4d16GLuc1CLgSk
+ZoNNiTW2bKg2SnkheCLQQrzRQDGQob4Ez8pn7fXwgNNgyYMqIgXQBztSvwyeqiv5
+u+YfjyW6hY0XHgL+XVAEV8/+LbzvXMAaq7afJMbfc2hIkCwU9D9SGuTSyxTDYWnP
+4vkYxboznxSjBF25cfe1lNj2M8FawTSLfJvdkzrnE6JwYZ+vj+vYxXX4M2bUdGc6
+N3ec592kD3ZDZopD8p/7DEJ4Y9HiD2971KE9dJeFt0g5QdYg/NA6s/rob8SKunE3
+vouXsXgxT7PntgMTzlSdriVZzH81Xwj3QEUxeCp6
+-----END CERTIFICATE-----
diff --git a/src/java.base/unix/native/libjli/java_md.c b/src/java.base/unix/native/libjli/java_md.c
index d2c04d8c25d..2a1a4e7795a 100644
--- a/src/java.base/unix/native/libjli/java_md.c
+++ b/src/java.base/unix/native/libjli/java_md.c
@@ -516,6 +516,17 @@ GetJREPath(char *path, jint pathsize, jboolean speculative)
         }
     }
 
+#if defined(AIX)
+    /* at least on AIX try also the LD_LIBRARY_PATH / LIBPATH */
+    if (GetApplicationHomeFromLibpath(path, pathsize)) {
+        JLI_Snprintf(libjava, sizeof(libjava), "%s/lib/" JAVA_DLL, path);
+        if (stat(libjava, &s) == 0) {
+            JLI_TraceLauncher("JRE path is %s\n", path);
+            return JNI_TRUE;
+        }
+    }
+#endif
+
     if (!speculative)
       JLI_ReportErrorMessage(JRE_ERROR8 JAVA_DLL);
     return JNI_FALSE;
diff --git a/src/java.base/unix/native/libjli/java_md.h b/src/java.base/unix/native/libjli/java_md.h
index e3600f67347..acc75ab091d 100644
--- a/src/java.base/unix/native/libjli/java_md.h
+++ b/src/java.base/unix/native/libjli/java_md.h
@@ -60,6 +60,7 @@ static jboolean GetJVMPath(const char *jrepath, const char *jvmtype,
 static jboolean GetJREPath(char *path, jint pathsize, jboolean speculative);
 
 #if defined(_AIX)
+jboolean GetApplicationHomeFromLibpath(char *buf, jint bufsize);
 #include "java_md_aix.h"
 #endif
 
diff --git a/src/java.base/unix/native/libjli/java_md_common.c b/src/java.base/unix/native/libjli/java_md_common.c
index 488b7382b7c..511519ae362 100644
--- a/src/java.base/unix/native/libjli/java_md_common.c
+++ b/src/java.base/unix/native/libjli/java_md_common.c
@@ -25,6 +25,8 @@
 #include <sys/time.h>
 #include "java.h"
 
+#define JAVA_DLL "libjava.so"
+
 /*
  * Find the last occurrence of a string
  */
@@ -108,6 +110,47 @@ GetApplicationHomeFromDll(char *buf, jint bufsize)
     return JNI_FALSE;
 }
 
+#if defined(AIX)
+static jboolean
+LibjavaExists(const char *path)
+{
+    char tmp[PATH_MAX + 1];
+    struct stat statbuf;
+    JLI_Snprintf(tmp, PATH_MAX, "%s/%s", path, JAVA_DLL);
+    if (stat(tmp, &statbuf) == 0) {
+        return JNI_TRUE;
+    }
+    return JNI_FALSE;
+}
+
+/*
+ * Retrieves the path to the JRE home by locating libjava.so in
+ * LIBPATH and then truncating the path to it.
+ */
+jboolean
+GetApplicationHomeFromLibpath(char *buf, jint bufsize)
+{
+    char *env = getenv("LIBPATH");
+    char *tmp;
+    char *save_ptr = NULL;
+    char *envpath = JLI_StringDup(env);
+    for (tmp = strtok_r(envpath, ":", &save_ptr); tmp != NULL; tmp = strtok_r(NULL, ":", &save_ptr)) {
+        if (LibjavaExists(tmp)) {
+            char *path = realpath(tmp, buf);
+            if (path == buf) {
+                JLI_StrCat(buf, "/");
+                if (JNI_TRUE == TruncatePath(buf, JNI_TRUE)) {
+                    JLI_MemFree(envpath);
+                    return JNI_TRUE;
+                }
+            }
+        }
+    }
+    JLI_MemFree(envpath);
+    return JNI_FALSE;
+}
+#endif
+
 /*
  * Return true if the named program exists
  */
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 919ce5d4256..28b913ed93d 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
@@ -118,7 +118,7 @@ public R visitTypeAsRecord(TypeElement e, P p) {
      * @param p {@inheritDoc ElementKindVisitor6}
      * @return  the result of {@code defaultAction}
      *
-     * @since 14
+     * @since 16
      */
     @Override
     public R visitVariableAsBindingVariable(VariableElement e, P p) {
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
index 47a2029d850..c5bde23b47e 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
@@ -250,6 +250,8 @@ public R visitTypeParameter(TypeParameterElement e, P p) {
      * @param e  {@inheritDoc ElementVisitor}
      * @param p  {@inheritDoc ElementVisitor}
      * @return the result of scanning
+     *
+     * @since 14
      */
     @Override
     public R visitRecordComponent(RecordComponentElement e, P p) {
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/Elements.java b/src/java.compiler/share/classes/javax/lang/model/util/Elements.java
index 56c86fc3ce4..2faf3f5ec32 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/Elements.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/Elements.java
@@ -277,19 +277,26 @@ default Set<? extends ModuleElement> getAllModuleElements() {
             getElementValuesWithDefaults(AnnotationMirror a);
 
     /**
-     * Returns the text of the documentation (&quot;Javadoc&quot;)
+     * Returns the text of the documentation (&quot;JavaDoc&quot;)
      * comment of an element.
      *
-     * <p> A documentation comment of an element is a comment that
-     * begins with "{@code /**}", ends with a separate
-     * "<code>*&#47;</code>", and immediately precedes the element,
-     * ignoring white space, annotations, end-of-line-comments ({@code
-     * "//"} comments), and intermediate traditional comments
-     * (<code>"/* ... *&#47;"</code> comments) that are not doc comments.
-     * Therefore, a documentation comment
-     * contains at least three "{@code *}" characters.  The text
+     * <p>A documentation comment of an element is a particular kind
+     * of comment that immediately precedes the element, ignoring
+     * white space, annotations and any other comments that are
+     * not themselves documentation comments.
+     *
+     * <p>There are two kinds of documentation comments, either based on
+     * <em>traditional comments</em> or based on a series of
+     * <em>end-of-line comments</em>. For both kinds, the text
      * returned for the documentation comment is a processed form of
-     * the comment as it appears in source code:
+     * the comment as it appears in source code, as described below.
+     *
+     * <p>A {@linkplain DocCommentKind#TRADITIONAL traditional
+     * documentation comment} is a traditional comment that begins
+     * with "{@code /**}", and ends with a separate "<code>*&#47;</code>".
+     * (Therefore, such a comment contains at least three "{@code *}"
+     * characters.)
+     * The lines of such a comment are processed as follows:
      * <ul>
      * <li>The leading "{@code /**}" is removed, as are any
      * immediately following space characters on that line. If all the
@@ -297,8 +304,8 @@ default Set<? extends ModuleElement> getAllModuleElements() {
      * the returned comment.
      * <li>For subsequent lines
      * of the doc comment starting after the initial "{@code /**}",
-     * if the lines start with <em>zero</em> or more whitespace characters followed by
-     * <em>one</em> or more "{@code *}" characters,
+     * if the lines start with <em>zero</em> or more whitespace characters
+     * followed by <em>one</em> or more "{@code *}" characters,
      * those leading whitespace characters are discarded as are any
      * consecutive "{@code *}" characters appearing after the white
      * space or starting the line.
@@ -306,22 +313,88 @@ default Set<? extends ModuleElement> getAllModuleElements() {
      * form, the entire line is retained.
      * <li> The trailing "<code>*&#47;</code>" is removed. The line
      * with the trailing" <code>*&#47;</code>" also undergoes leading
-     * space and "{@code *}" character removal as described above. If all the characters
-     * of the line are removed, it makes no contribution to the
-     * returned comment.
+     * space and "{@code *}" character removal as described above.
+     * <li>The processed lines are then concatenated together,
+     * separated by newline ("{@code \n}") characters, and returned.
+     * </ul>
+     *
+     * <p>An {@linkplain DocCommentKind#END_OF_LINE end-of-line
+     * documentation comment} is a series of adjacent end-of-line
+     * comments, each on a line by itself, ignoring any whitespace
+     * characters at the beginning of the line, and each beginning
+     * with "{@code ///}".
+     * The lines of such a comment are processed as follows:
+     * <ul>
+     * <li>Any leading whitespace and the three initial "{@code /}"
+     * characters are removed from each line.
+     * <li>The lines are shifted left, by removing leading whitespace
+     * characters, until the non-blank line with the least leading
+     * whitespace characters has no remaining leading whitespace
+     * characters.
+     * <li>Additional leading whitespace characters and any trailing
+     * whitespace characters in each line are preserved.
+     * <li>
+     * The processed lines are then concatenated together,
+     * separated by newline ("{@code \n}") characters, and returned.
+     * If the last line is not blank, the returned value will not be
+     * terminated by a newline character.
      * </ul>
-     * The processed lines are then
-     * concatenated together (including line terminators) and
-     * returned.
      *
      * @param e  the element being examined
      * @return the documentation comment of the element, or {@code null}
      *          if there is none
      * @jls 3.6 White Space
      * @jls 3.7 Comments
+     *
+     * @apiNote
+     * Documentation comments are processed by the standard doclet
+     * used by the {@code javadoc} tool to generate API documentation.
      */
     String getDocComment(Element e);
 
+    /**
+     * {@return the kind of the documentation comment for the given element,
+     * or {@code null} if there is no comment or the kind is not known}
+     *
+     * @implSpec The default implementation of this method returns
+     * {@code null}.
+     *
+     * @param e the element being examined
+     * @since 23
+     */
+    default DocCommentKind getDocCommentKind(Element e) {
+        return null;
+    }
+
+    /**
+     * The kind of documentation comment.
+     *
+     * @since 23
+     */
+    enum DocCommentKind {
+        /**
+         * The kind of comments whose lines are prefixed by {@code ///}.
+         *
+         * @apiNote
+         * The standard doclet used by the {@code javadoc} tool treats these comments
+         * as containing Markdown and documentation comment tags.
+         *
+         *
+         * @see <a href="https://openjdk.org/jeps/467">
+         * JEP 467: Markdown Documentation Comments</a>
+         */
+        END_OF_LINE,
+
+        /**
+         * The kind of comments that begin with {@code /**}.
+         *
+         * @apiNote
+         * The standard doclet used by the {@code javadoc} tool treats these comments
+         * as containing HTML and documentation comment tags.
+         */
+        TRADITIONAL
+    }
+
     /**
      * {@return {@code true} if the element is deprecated, {@code false} otherwise}
      *
diff --git a/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java b/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java
index e0bb999c05b..40224abbd50 100644
--- a/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java
+++ b/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java
@@ -154,6 +154,8 @@ public JavaFileObject getJavaFileForOutput(Location location,
      *
      * @throws IllegalArgumentException {@inheritDoc}
      * @throws IllegalStateException {@inheritDoc}
+     *
+     * @since 18
      */
     @Override
     public JavaFileObject getJavaFileForOutputForOriginatingFiles(Location location,
@@ -214,6 +216,8 @@ public FileObject getFileForOutput(Location location,
      *
      * @throws IllegalArgumentException {@inheritDoc}
      * @throws IllegalStateException {@inheritDoc}
+     *
+     * @since 18
      */
     @Override
     public FileObject getFileForOutputForOriginatingFiles(Location location,
diff --git a/src/java.desktop/share/classes/java/beans/Beans.java b/src/java.desktop/share/classes/java/beans/Beans.java
index 165aba4708b..cd42aaaa33e 100644
--- a/src/java.desktop/share/classes/java/beans/Beans.java
+++ b/src/java.desktop/share/classes/java/beans/Beans.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,8 +102,10 @@ public static Object instantiate(ClassLoader cls, String beanName) throws IOExce
      *              object could not be found.
      * @throws IOException if an I/O error occurs.
      * @since 1.2
+     * @deprecated this method will be removed when java.beans.beancontext is removed
      */
-    @SuppressWarnings("deprecation")
+    @Deprecated(since = "23", forRemoval = true)
+    @SuppressWarnings({"deprecation", "removal"})
     public static Object instantiate(ClassLoader cls, String beanName,
                                      BeanContext beanContext)
             throws IOException, ClassNotFoundException {
@@ -352,7 +354,8 @@ public static Object instantiate(ClassLoader cls, String beanName,
         return result;
     }
 
-    @SuppressWarnings("unchecked")
+    @Deprecated(since = "23", forRemoval = true)
+    @SuppressWarnings({ "unchecked", "removal" })
     private static void unsafeBeanContextAdd(BeanContext beanContext, Object res) {
         beanContext.add(res);
     }
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java
index abc686f963c..d41f286fc31 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,8 @@
  * @see java.util.Collection
  */
 
-@SuppressWarnings("rawtypes")
+@Deprecated(since = "23", forRemoval = true)
+@SuppressWarnings({"rawtypes", "removal"})
 public interface BeanContext extends BeanContextChild, Collection, DesignMode, Visibility {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java
index c1e92715875..4d0c029fa71 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,6 +65,8 @@
  * @see java.beans.VetoableChangeListener
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextChild {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java
index 8bab7514908..91d22ecce3b 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,8 @@
  * @see java.beans.beancontext.BeanContextSupport
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextChildComponentProxy {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java
index e3a213a8dfa..532661dc29b 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,6 +54,8 @@
  * @see java.beans.beancontext.BeanContextChild
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public class BeanContextChildSupport implements BeanContextChild, BeanContextServicesListener, Serializable {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java
index 3934d0afadd..3c6e0656c50 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,8 @@
  * @see java.beans.beancontext.BeanContextSupport
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextContainerProxy {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java
index 9e4c2f3a53e..62fd45eee79 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,6 +46,8 @@
  * @see         java.beans.beancontext.BeanContext
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public abstract class BeanContextEvent extends EventObject {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java
index 466c4fa44a2..5c5d112d36a 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,6 +50,9 @@
  * @see         java.beans.beancontext.BeanContextEvent
  * @see         java.beans.beancontext.BeanContextMembershipListener
  */
+
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public class BeanContextMembershipEvent extends BeanContextEvent {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java
index 8f68792fcb2..37f124fd5d8 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,8 @@
  * @see         java.beans.beancontext.BeanContext
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextMembershipListener extends EventListener {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java
index cff8e7624fd..b7b8de50310 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,6 +72,8 @@
  * @see java.beans.beancontext.BeanContextChildSupport
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextProxy {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java
index 1521f8e01ed..dd4cc457a31 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
  * </p>
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since="23", forRemoval=true)
 public class BeanContextServiceAvailableEvent extends BeanContextEvent {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java
index f3de87b4344..7b5db26ad84 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,6 +49,8 @@
  * </p>
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextServiceProvider {
 
    /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java
index 298be756e26..11fe3fff730 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
  * services.
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextServiceProviderBeanInfo extends BeanInfo {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java
index 3b8c9f2d756..d32b18376a4 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,9 @@
  * identify the service being revoked.
  * </p>
  */
+
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public class BeanContextServiceRevokedEvent extends BeanContextEvent {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java
index 9a1a70863b1..96d31a0885a 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,9 @@
  * interested in processing a {@code BeanContextServiceRevokedEvent}
  * implements this interface.
  */
+
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextServiceRevokedListener extends EventListener {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java
index b132ee069ca..1a346450024 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,9 @@
  * to expose generic "services" to the BeanContextChild objects within.
  * </p>
  */
+
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextServices extends BeanContext, BeanContextServicesListener {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java
index 247c4f44b19..ca506fb45f7 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 1014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,9 @@
  * A class that is interested in processing a
  * {@code BeanContextServiceAvailableEvent} implements this interface.
  */
+
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextServicesListener extends BeanContextServiceRevokedListener {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java
index 21e136ba9e5..98d68d92fa1 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,6 +54,9 @@
  * @author Laurence P. G. Cable
  * @since 1.2
  */
+
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public class      BeanContextServicesSupport extends BeanContextSupport
        implements BeanContextServices {
 
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java
index cc61cc78612..fedd6667de1 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java
@@ -59,6 +59,9 @@
  * @author Laurence P. G. Cable
  * @since 1.2
  */
+
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public class      BeanContextSupport extends BeanContextChildSupport
        implements BeanContext,
                   Serializable,
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/package-info.java b/src/java.desktop/share/classes/java/beans/beancontext/package-info.java
index f1b22cf7da0..25c38996dee 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/package-info.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,13 @@
  * contains events and listener interface for beans being added and removed from
  * a bean context.
  *
+ * This package has been deprecated and may be removed in a future version of the Java Platform
+ * There is no replacement.
+ *
+ * All of the classes and interfaces in this package have been terminally deprecated.
+ *
+ * Users are advised to migrate their applications to other technologies.
+ *
  * @since 1.2
  */
 package java.beans.beancontext;
diff --git a/src/java.desktop/share/classes/javax/swing/CellEditor.java b/src/java.desktop/share/classes/javax/swing/CellEditor.java
index bf9a23d2f77..5a4cfd4f977 100644
--- a/src/java.desktop/share/classes/javax/swing/CellEditor.java
+++ b/src/java.desktop/share/classes/javax/swing/CellEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -85,12 +85,12 @@ public interface CellEditor {
 
     /**
      * Returns true if the editing cell should be selected, false otherwise.
-     * Typically, the return value is true, because is most cases the editing
+     * Typically, the return value is true, because in most cases the editing
      * cell should be selected.  However, it is useful to return false to
-     * keep the selection from changing for some types of edits.
-     * eg. A table that contains a column of check boxes, the user might
+     * keep the selection from changing for some types of edits,
+     * e.g. in a table that contains a column of check boxes, the user might
      * want to be able to change those checkboxes without altering the
-     * selection.  (See Netscape Communicator for just such an example)
+     * selection.
      * Of course, it is up to the client of the editor to use the return
      * value, but it doesn't need to if it doesn't want to.
      *
diff --git a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectorServer.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectorServer.java
index 139b7653424..0502cb8a971 100644
--- a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectorServer.java
+++ b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectorServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,21 +102,23 @@ public class RMIConnectorServer extends JMXConnectorServer {
         "jmx.remote.rmi.server.socket.factory";
 
     /**
-    * Name of the attribute that specifies an
-    * {@link ObjectInputFilter} pattern string to filter classes acceptable
-    * for {@link RMIServer#newClient(java.lang.Object) RMIServer.newClient()}
-    * remote method call.
-    * <p>
-    * The filter pattern must be in same format as used in
-    * {@link java.io.ObjectInputFilter.Config#createFilter}
-    * <p>
-    * This list of classes allowed by filter should correspond to the
-    * transitive closure of the credentials class (or classes) used by the
-    * installed {@linkplain JMXAuthenticator} associated with the
-    * {@linkplain RMIServer} implementation.
-    * If the attribute is not set then any class is deemed acceptable.
-    * @see ObjectInputFilter
-    */
+     * Name of the attribute that specifies an
+     * {@link ObjectInputFilter} pattern string to filter classes acceptable
+     * for {@link RMIServer#newClient(java.lang.Object) RMIServer.newClient()}
+     * remote method call.
+     * <p>
+     * The filter pattern must be in same format as used in
+     * {@link java.io.ObjectInputFilter.Config#createFilter}
+     * <p>
+     * This list of classes allowed by filter should correspond to the
+     * transitive closure of the credentials class (or classes) used by the
+     * installed {@linkplain JMXAuthenticator} associated with the
+     * {@linkplain RMIServer} implementation.
+     * If the attribute is not set then any class is deemed acceptable.
+     * @see ObjectInputFilter
+     *
+     * @since 10
+     */
     public static final String CREDENTIALS_FILTER_PATTERN =
         "jmx.remote.rmi.server.credentials.filter.pattern";
 
@@ -152,6 +154,8 @@ public class RMIConnectorServer extends JMXConnectorServer {
      * an allow-list that is too narrow or a reject-list that is too wide may
      * prevent legitimate clients from interoperating with the
      * {@code JMXConnectorServer}.
+     *
+     * @since 10
      */
     public static final String SERIAL_FILTER_PATTERN =
        "jmx.remote.rmi.server.serial.filter.pattern";
diff --git a/src/java.management.rmi/share/classes/javax/management/remote/rmi/package-info.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/package-info.java
new file mode 100644
index 00000000000..d26c797e688
--- /dev/null
+++ b/src/java.management.rmi/share/classes/javax/management/remote/rmi/package-info.java
@@ -0,0 +1,326 @@
+/*
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ *    <p>The RMI connector is a connector for the JMX Remote API that
+ *      uses RMI to transmit client requests to a remote MBean server.
+ *      This package defines the classes that the user of an RMI
+ *      connector needs to reference directly, for both the client and
+ *      server sides.  It also defines certain classes that the user
+ *      will not usually reference directly, but that must be defined so
+ *      that different implementations of the RMI connector can
+ *      interoperate.</p>
+ *
+ *    <p>The RMI connector supports the JRMP transport for RMI.</p>
+ *
+ *    <p>Like most connectors in the JMX Remote API, an RMI connector
+ *      usually has an address, which
+ *      is a {@link javax.management.remote.JMXServiceURL
+ *      JMXServiceURL}.  The protocol part of this address is
+ *      <code>rmi</code> for a connector that uses the default RMI
+ *      transport (JRMP).</p>
+ *
+ *    <p>There are two forms for RMI connector addresses:</p>
+ *
+ *    <ul>
+ *      <li>
+ *  In the <em>JNDI form</em>, the URL indicates <em>where to find
+ *  an RMI stub for the connector</em>.  This RMI stub is a Java
+ *  object of type {@link javax.management.remote.rmi.RMIServer
+ *  RMIServer} that gives remote access to the connector server.
+ *  With this address form, the RMI stub is obtained from an
+ *  external directory entry included in the URL.  An external
+ *  directory is any directory recognized by {@link javax.naming
+ *  JNDI}, typically the RMI registry, LDAP, or COS Naming.
+ *
+ *      <li>
+ *  In the <em>encoded form</em>, the URL directly includes the
+ *  information needed to connect to the connector server.  When
+ *  using RMI/JRMP, the encoded form is the serialized RMI stub
+ *  for the server object, encoded using BASE64 without embedded
+ *  newlines.
+ *    </ul>
+ *
+ *    <p>Addresses are covered in more detail below.</p>
+ *
+ *
+ *    <h2>Creating an RMI connector server</h2>
+ *
+ *    <p>The usual way to create an RMI connector server is to supply an
+ *      RMI connector address to the method {@link
+ *      javax.management.remote.JMXConnectorServerFactory#newJMXConnectorServer
+ *      JMXConnectorServerFactory.newJMXConnectorServer}.  The MBean
+ *      server to which the connector server is attached can be
+ *      specified as a parameter to that method.  Alternatively, the
+ *      connector server can be registered as an MBean in that MBean
+ *      server.</p>
+ *
+ *    <p>An RMI connector server can also be created by constructing an
+ *      instance of {@link
+ *      javax.management.remote.rmi.RMIConnectorServer
+ *      RMIConnectorServer}, explicitly or through the MBean server's
+ *      <code>createMBean</code> method.</p>
+ *
+ *    <h3>Choosing the RMI transport</h3>
+ *
+ *    <p>You can choose the RMI transport by specifying
+ *      <code>rmi</code> in the <code><em>protocol</em></code> part of the
+ *      <code>serviceURL</code> when creating the connector server.  You
+ *      can also create specialized connector servers by instantiating
+ *      an appropriate subclass of {@link
+ *      javax.management.remote.rmi.RMIServerImpl RMIServerImpl} and
+ *      supplying it to the <code>RMIConnectorServer</code>
+ *      constructor.</p>
+ *
+ *
+ *    <h3><a id="servergen">Connector addresses generated by the
+ *  server</a></h3>
+ *
+ *    <p>If the <code>serviceURL</code> you specify has an empty URL
+ *      path (after the optional host and port), or if you do not
+ *      specify a <code>serviceURL</code>, then the connector server
+ *      will fabricate a new <code>JMXServiceURL</code> that clients can
+ *      use to connect:</p>
+ *
+ *    <ul>
+ *
+ *      <li><p>If the <code>serviceURL</code> looks like:</p>
+ *
+ *  <pre>
+ *  <code>service:jmx:rmi://<em>host</em>:<em>port</em></code>
+ *  </pre>
+ *
+ *  <p>then the connector server will generate an {@link
+ *  javax.management.remote.rmi.RMIJRMPServerImpl
+ *  RMIJRMPServerImpl} and the returned <code>JMXServiceURL</code>
+ *  looks like:</p>
+ *
+ *  <pre>
+ *  <code>service:jmx:rmi://<em>host</em>:<em>port</em>/stub/<em>XXXX</em></code>
+ *  </pre>
+ *
+ *  <p>where <code><em>XXXX</em></code> is the serialized form of the
+ *  stub for the generated object, encoded in BASE64 without
+ *  newlines.</p>
+ *
+ *      <li><p>If there is no <code>serviceURL</code>, there must be a
+ *  user-provided <code>RMIServerImpl</code>.  The connector server
+ *        will generate a <code>JMXServiceURL</code> using the <code>rmi</code>
+ *  form.</p>
+ *
+ *    </ul>
+ *
+ *    <p>The <code><em>host</em></code> in a user-provided
+ *      <code>serviceURL</code> is optional.  If present, it is copied
+ *      into the generated <code>JMXServiceURL</code> but otherwise
+ *      ignored.  If absent, the generated <code>JXMServiceURL</code>
+ *      will have the local host name.</p>
+ *
+ *    <p>The <code><em>port</em></code> in a user-provided
+ *      <code>serviceURL</code> is also optional.  If present, it is
+ *      also copied into the generated <code>JMXServiceURL</code>;
+ *      otherwise, the generated <code>JMXServiceURL</code> has no port.
+ *      For an <code>serviceURL</code> using the <code>rmi</code>
+ *      protocol, the <code><em>port</em></code>, if present, indicates
+ *      what port the generated remote object should be exported on.  It
+ *      has no other effect.</p>
+ *
+ *    <p>If the user provides an <code>RMIServerImpl</code> rather than a
+ *      <code>JMXServiceURL</code>, then the generated
+ *      <code>JMXServiceURL</code> will have the local host name in its
+ *      <code><em>host</em></code> part and no
+ *      <code><em>port</em></code>.</p>
+ *
+ *
+ *    <h3><a id="directory">Connector addresses based on directory
+ *  entries</a></h3>
+ *
+ *    <p>As an alternative to the generated addresses just described,
+ *      the <code>serviceURL</code> address supplied when creating a
+ *      connector server can specify a <em>directory address</em> in
+ *      which to store the provided or generated <code>RMIServer</code>
+ *      stub.  This directory address is then used by both client and
+ *      server.</p>
+ *
+ *    <p>In this case, the <code>serviceURL</code> has the following form:</p>
+ *
+ *    <pre>
+ *    <code>service:jmx:rmi://<em>host</em>:<em>port</em>/jndi/<em>jndi-name</em></code>
+ *    </pre>
+ *
+ *    <p>Here, <code><em>jndi-name</em></code> is a string that can be
+ *      supplied to {@link javax.naming.InitialContext#bind
+ *      javax.naming.InitialContext.bind}.</p>
+ *
+ *    <p>As usual, the <code><em>host</em></code> and
+ *      <code>:<em>port</em></code> can be omitted.</p>
+ *
+ *    <p>The connector server will generate an
+ *      <code>RMIServerImpl</code> based on the protocol
+ *      (<code>rmi</code>) and the <code><em>port</em></code> if any.  When
+ *      the connector server is started, it will derive a stub from this
+ *      object using its {@link
+ *      javax.management.remote.rmi.RMIServerImpl#toStub toStub} method
+ *      and store the object using the given
+ *      <code><em>jndi-name</em></code>.  The properties defined by the
+ *      JNDI API are consulted as usual.</p>
+ *
+ *    <p>For example, if the <code>JMXServiceURL</code> is:
+ *
+ *      <pre>
+ *      <code>service:jmx:rmi://ignoredhost/jndi/rmi://myhost/myname</code>
+ *      </pre>
+ *
+ *      then the connector server will generate an
+ *      <code>RMIJRMPServerImpl</code> and store its stub using the JNDI
+ *      name
+ *
+ *      <pre>
+ *      <code>rmi://myhost/myname</code>
+ *      </pre>
+ *
+ *      which means entry <code>myname</code> in the RMI registry
+ *      running on the default port of host <code>myhost</code>.  Note
+ *      that the RMI registry only allows registration from the local
+ *      host.  So, in this case, <code>myhost</code> must be the name
+ *      (or a name) of the host that the connector server is running
+ *      on.
+ *
+ *    <p>In this <code>JMXServiceURL</code>, the first <code>rmi:</code>
+ *      specifies the RMI
+ *      connector, while the second <code>rmi:</code> specifies the RMI
+ *      registry.
+ *
+ *    <p>As another example, if the <code>JMXServiceURL</code> is:
+ *
+ *      <pre>
+ *      <code>service:jmx:rmi://ignoredhost/jndi/ldap://dirhost:9999/cn=this,ou=that</code>
+ *      </pre>
+ *
+ *      then the connector server will generate an
+ *      <code>RMIJRMPServerImpl</code> and store its stub using the JNDI
+ *      name
+ *
+ *      <pre>
+ *      <code>ldap://dirhost:9999/cn=this,ou=that</code>
+ *      </pre>
+ *
+ *      which means entry <code>cn=this,ou=that</code> in the LDAP
+ *      directory running on port 9999 of host <code>dirhost</code>.
+ *
+ *    <p>If the <code>JMXServiceURL</code> is:
+ *
+ *      <pre>
+ *      <code>service:jmx:rmi://ignoredhost/jndi/cn=this,ou=that</code>
+ *      </pre>
+ *
+ *      then the connector server will generate an
+ *      <code>RMIJRMPServerImpl</code> and store its stub using the JNDI
+ *      name
+ *
+ *      <pre>
+ *      <code>cn=this,ou=that</code>
+ *      </pre>
+ *
+ *      For this case to work, the JNDI API must have been configured
+ *      appropriately to supply the information about what directory to
+ *      use.
+ *
+ *    <p>In these examples, the host name <code>ignoredhost</code> is
+ *      not used by the connector server or its clients.  It can be
+ *      omitted, for example:</p>
+ *
+ *      <pre>
+ *      <code>service:jmx:rmi:///jndi/cn=this,ou=that</code>
+ *      </pre>
+ *
+ *    <p>However, it is good practice to use the name of the host
+ *      where the connector server is running.  This is often different
+ *      from the name of the directory host.</p>
+ *
+ *
+ *    <h3>Connector server attributes</h3>
+ *
+ *    <p>When using the default JRMP transport, RMI socket factories can
+ *      be specified using the attributes
+ *      <code>jmx.remote.rmi.client.socket.factory</code> and
+ *      <code>jmx.remote.rmi.server.socket.factory</code> in the
+ *      <code>environment</code> given to the
+ *      <code>RMIConnectorServer</code> constructor.  The values of these
+ *      attributes must be of type {@link
+ *      java.rmi.server.RMIClientSocketFactory} and {@link
+ *      java.rmi.server.RMIServerSocketFactory}, respectively.  These
+ *      factories are used when creating the RMI objects associated with
+ *      the connector.</p>
+ *
+ *    <h2>Creating an RMI connector client</h2>
+ *
+ *    <p>An RMI connector client is usually constructed using {@link
+ *      javax.management.remote.JMXConnectorFactory}, with a
+ *      <code>JMXServiceURL</code> that has <code>rmi</code> as its protocol.</p>
+ *
+ *    <p>If the <code>JMXServiceURL</code> was generated by the server,
+ *      as described above under <a href="#servergen">"connector
+ *      addresses generated by the server"</a>, then the client will
+ *      need to obtain it directly or indirectly from the server.
+ *      Typically, the server makes the <code>JMXServiceURL</code>
+ *      available by storing it in a file or a lookup service.</p>
+ *
+ *    <p>If the <code>JMXServiceURL</code> uses the directory syntax, as
+ *      described above under <a href="#directory">"connector addresses
+ *      based on directory entries"</a>, then the client may obtain it
+ *      as just explained, or client and server may both know the
+ *      appropriate directory entry to use.  For example, if the
+ *      connector server for the Whatsit agent uses the entry
+ *      <code>whatsit-agent-connector</code> in the RMI registry on host
+ *      <code>myhost</code>, then client and server can both know
+ *      that the appropriate <code>JMXServiceURL</code> is:</p>
+ *
+ *    <pre>
+ *    <code>service:jmx:rmi:///jndi/rmi://myhost/whatsit-agent-connector</code>
+ *    </pre>
+ *
+ *    <p>If you have an RMI stub of type {@link
+ *      javax.management.remote.rmi.RMIServer RMIServer}, you can
+ *      construct an RMI connection directly by using the appropriate
+ *      constructor of {@link javax.management.remote.rmi.RMIConnector
+ *      RMIConnector}.</p>
+ *
+ *    <h2>Dynamic code downloading</h2>
+ *
+ *    <p>If an RMI connector client or server receives from its peer an
+ *      instance of a class that it does not know, and if dynamic code
+ *      downloading is active for the RMI connection, then the class can
+ *      be downloaded from a codebase specified by the peer.
+ *      {@extLink rmi_guide Java RMI Guide} explains this in more detail.</p>
+ *
+ *    @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045,
+ *    section 6.8, "Base64 Content-Transfer-Encoding"</a>
+ *
+ *
+ *    @since 1.5
+ *
+ */
+package javax.management.remote.rmi;
diff --git a/src/java.management.rmi/share/classes/javax/management/remote/rmi/package.html b/src/java.management.rmi/share/classes/javax/management/remote/rmi/package.html
deleted file mode 100644
index 9afd476f247..00000000000
--- a/src/java.management.rmi/share/classes/javax/management/remote/rmi/package.html
+++ /dev/null
@@ -1,329 +0,0 @@
-<html>
-<head>
-    <title>RMI connector</title>
-<!--
-Copyright (c) 2002, 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.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the LICENSE file that accompanied this code.
-
-This code is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-version 2 for more details (a copy is included in the LICENSE file that
-accompanied this code).
-
-You should have received a copy of the GNU General Public License version
-2 along with this work; if not, write to the Free Software Foundation,
-Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-or visit www.oracle.com if you need additional information or have any
-questions.
--->
-</head>
-<body bgcolor="white">
-    <p>The RMI connector is a connector for the JMX Remote API that
-      uses RMI to transmit client requests to a remote MBean server.
-      This package defines the classes that the user of an RMI
-      connector needs to reference directly, for both the client and
-      server sides.  It also defines certain classes that the user
-      will not usually reference directly, but that must be defined so
-      that different implementations of the RMI connector can
-      interoperate.</p>
-
-    <p>The RMI connector supports the JRMP transport for RMI.</p>
-
-    <p>Like most connectors in the JMX Remote API, an RMI connector
-      usually has an address, which
-      is a {@link javax.management.remote.JMXServiceURL
-      JMXServiceURL}.  The protocol part of this address is
-      <code>rmi</code> for a connector that uses the default RMI
-      transport (JRMP).</p>
-
-    <p>There are two forms for RMI connector addresses:</p>
-
-    <ul>
-      <li>
-	In the <em>JNDI form</em>, the URL indicates <em>where to find
-	an RMI stub for the connector</em>.  This RMI stub is a Java
-	object of type {@link javax.management.remote.rmi.RMIServer
-	RMIServer} that gives remote access to the connector server.
-	With this address form, the RMI stub is obtained from an
-	external directory entry included in the URL.  An external
-	directory is any directory recognized by {@link javax.naming
-	JNDI}, typically the RMI registry, LDAP, or COS Naming.
-
-      <li>
-	In the <em>encoded form</em>, the URL directly includes the
-	information needed to connect to the connector server.  When
-	using RMI/JRMP, the encoded form is the serialized RMI stub
-	for the server object, encoded using BASE64 without embedded
-	newlines.
-    </ul>
-
-    <p>Addresses are covered in more detail below.</p>
-
-
-    <h2>Creating an RMI connector server</h2>
-
-    <p>The usual way to create an RMI connector server is to supply an
-      RMI connector address to the method {@link
-      javax.management.remote.JMXConnectorServerFactory#newJMXConnectorServer
-      JMXConnectorServerFactory.newJMXConnectorServer}.  The MBean
-      server to which the connector server is attached can be
-      specified as a parameter to that method.  Alternatively, the
-      connector server can be registered as an MBean in that MBean
-      server.</p>
-
-    <p>An RMI connector server can also be created by constructing an
-      instance of {@link
-      javax.management.remote.rmi.RMIConnectorServer
-      RMIConnectorServer}, explicitly or through the MBean server's
-      <code>createMBean</code> method.</p>
-
-    <h3>Choosing the RMI transport</h3>
-
-    <p>You can choose the RMI transport by specifying
-      <code>rmi</code> in the <code><em>protocol</em></code> part of the
-      <code>serviceURL</code> when creating the connector server.  You
-      can also create specialized connector servers by instantiating
-      an appropriate subclass of {@link
-      javax.management.remote.rmi.RMIServerImpl RMIServerImpl} and
-      supplying it to the <code>RMIConnectorServer</code>
-      constructor.</p>
-
-
-    <h3><a id="servergen">Connector addresses generated by the
-	server</a></h3>
-
-    <p>If the <code>serviceURL</code> you specify has an empty URL
-      path (after the optional host and port), or if you do not
-      specify a <code>serviceURL</code>, then the connector server
-      will fabricate a new <code>JMXServiceURL</code> that clients can
-      use to connect:</p>
-
-    <ul>
-
-      <li><p>If the <code>serviceURL</code> looks like:</p>
-
-	<pre>
-	<code>service:jmx:rmi://<em>host</em>:<em>port</em></code>
-	</pre>
-
-	<p>then the connector server will generate an {@link
-	javax.management.remote.rmi.RMIJRMPServerImpl
-	RMIJRMPServerImpl} and the returned <code>JMXServiceURL</code>
-	looks like:</p>
-
-	<pre>
-	<code>service:jmx:rmi://<em>host</em>:<em>port</em>/stub/<em>XXXX</em></code>
-	</pre>
-
-	<p>where <code><em>XXXX</em></code> is the serialized form of the
-	stub for the generated object, encoded in BASE64 without
-	newlines.</p>
-
-      <li><p>If there is no <code>serviceURL</code>, there must be a
-	user-provided <code>RMIServerImpl</code>.  The connector server
-        will generate a <code>JMXServiceURL</code> using the <code>rmi</code>
-	form.</p>
-
-    </ul>
-
-    <p>The <code><em>host</em></code> in a user-provided
-      <code>serviceURL</code> is optional.  If present, it is copied
-      into the generated <code>JMXServiceURL</code> but otherwise
-      ignored.  If absent, the generated <code>JXMServiceURL</code>
-      will have the local host name.</p>
-
-    <p>The <code><em>port</em></code> in a user-provided
-      <code>serviceURL</code> is also optional.  If present, it is
-      also copied into the generated <code>JMXServiceURL</code>;
-      otherwise, the generated <code>JMXServiceURL</code> has no port.
-      For an <code>serviceURL</code> using the <code>rmi</code>
-      protocol, the <code><em>port</em></code>, if present, indicates
-      what port the generated remote object should be exported on.  It
-      has no other effect.</p>
-
-    <p>If the user provides an <code>RMIServerImpl</code> rather than a
-      <code>JMXServiceURL</code>, then the generated
-      <code>JMXServiceURL</code> will have the local host name in its
-      <code><em>host</em></code> part and no
-      <code><em>port</em></code>.</p>
-
-
-    <h3><a id="directory">Connector addresses based on directory
-	entries</a></h3>
-
-    <p>As an alternative to the generated addresses just described,
-      the <code>serviceURL</code> address supplied when creating a
-      connector server can specify a <em>directory address</em> in
-      which to store the provided or generated <code>RMIServer</code>
-      stub.  This directory address is then used by both client and
-      server.</p>
-
-    <p>In this case, the <code>serviceURL</code> has the following form:</p>
-
-    <pre>
-    <code>service:jmx:rmi://<em>host</em>:<em>port</em>/jndi/<em>jndi-name</em></code>
-    </pre>
-
-    <p>Here, <code><em>jndi-name</em></code> is a string that can be
-      supplied to {@link javax.naming.InitialContext#bind
-      javax.naming.InitialContext.bind}.</p>
-
-    <p>As usual, the <code><em>host</em></code> and
-      <code>:<em>port</em></code> can be omitted.</p>
-
-    <p>The connector server will generate an
-      <code>RMIServerImpl</code> based on the protocol
-      (<code>rmi</code>) and the <code><em>port</em></code> if any.  When
-      the connector server is started, it will derive a stub from this
-      object using its {@link
-      javax.management.remote.rmi.RMIServerImpl#toStub toStub} method
-      and store the object using the given
-      <code><em>jndi-name</em></code>.  The properties defined by the
-      JNDI API are consulted as usual.</p>
-
-    <p>For example, if the <code>JMXServiceURL</code> is:
-
-      <pre>
-      <code>service:jmx:rmi://ignoredhost/jndi/rmi://myhost/myname</code>
-      </pre>
-
-      then the connector server will generate an
-      <code>RMIJRMPServerImpl</code> and store its stub using the JNDI
-      name
-
-      <pre>
-      <code>rmi://myhost/myname</code>
-      </pre>
-
-      which means entry <code>myname</code> in the RMI registry
-      running on the default port of host <code>myhost</code>.  Note
-      that the RMI registry only allows registration from the local
-      host.  So, in this case, <code>myhost</code> must be the name
-      (or a name) of the host that the connector server is running
-      on.
-
-    <p>In this <code>JMXServiceURL</code>, the first <code>rmi:</code>
-      specifies the RMI
-      connector, while the second <code>rmi:</code> specifies the RMI
-      registry.
-
-    <p>As another example, if the <code>JMXServiceURL</code> is:
-
-      <pre>
-      <code>service:jmx:rmi://ignoredhost/jndi/ldap://dirhost:9999/cn=this,ou=that</code>
-      </pre>
-
-      then the connector server will generate an
-      <code>RMIJRMPServerImpl</code> and store its stub using the JNDI
-      name
-
-      <pre>
-      <code>ldap://dirhost:9999/cn=this,ou=that</code>
-      </pre>
-
-      which means entry <code>cn=this,ou=that</code> in the LDAP
-      directory running on port 9999 of host <code>dirhost</code>.
-
-    <p>If the <code>JMXServiceURL</code> is:
-
-      <pre>
-      <code>service:jmx:rmi://ignoredhost/jndi/cn=this,ou=that</code>
-      </pre>
-
-      then the connector server will generate an
-      <code>RMIJRMPServerImpl</code> and store its stub using the JNDI
-      name
-
-      <pre>
-      <code>cn=this,ou=that</code>
-      </pre>
-
-      For this case to work, the JNDI API must have been configured
-      appropriately to supply the information about what directory to
-      use.
-
-    <p>In these examples, the host name <code>ignoredhost</code> is
-      not used by the connector server or its clients.  It can be
-      omitted, for example:</p>
-
-      <pre>
-      <code>service:jmx:rmi:///jndi/cn=this,ou=that</code>
-      </pre>
-
-    <p>However, it is good practice to use the name of the host
-      where the connector server is running.  This is often different
-      from the name of the directory host.</p>
-
-
-    <h3>Connector server attributes</h3>
-
-    <p>When using the default JRMP transport, RMI socket factories can
-      be specified using the attributes
-      <code>jmx.remote.rmi.client.socket.factory</code> and
-      <code>jmx.remote.rmi.server.socket.factory</code> in the
-      <code>environment</code> given to the
-      <code>RMIConnectorServer</code> constructor.  The values of these
-      attributes must be of type {@link
-      java.rmi.server.RMIClientSocketFactory} and {@link
-      java.rmi.server.RMIServerSocketFactory}, respectively.  These
-      factories are used when creating the RMI objects associated with
-      the connector.</p>
-
-    <h2>Creating an RMI connector client</h2>
-
-    <p>An RMI connector client is usually constructed using {@link
-      javax.management.remote.JMXConnectorFactory}, with a
-      <code>JMXServiceURL</code> that has <code>rmi</code> as its protocol.</p>
-
-    <p>If the <code>JMXServiceURL</code> was generated by the server,
-      as described above under <a href="#servergen">"connector
-      addresses generated by the server"</a>, then the client will
-      need to obtain it directly or indirectly from the server.
-      Typically, the server makes the <code>JMXServiceURL</code>
-      available by storing it in a file or a lookup service.</p>
-
-    <p>If the <code>JMXServiceURL</code> uses the directory syntax, as
-      described above under <a href="#directory">"connector addresses
-      based on directory entries"</a>, then the client may obtain it
-      as just explained, or client and server may both know the
-      appropriate directory entry to use.  For example, if the
-      connector server for the Whatsit agent uses the entry
-      <code>whatsit-agent-connector</code> in the RMI registry on host
-      <code>myhost</code>, then client and server can both know
-      that the appropriate <code>JMXServiceURL</code> is:</p>
-
-    <pre>
-    <code>service:jmx:rmi:///jndi/rmi://myhost/whatsit-agent-connector</code>
-    </pre>
-
-    <p>If you have an RMI stub of type {@link
-      javax.management.remote.rmi.RMIServer RMIServer}, you can
-      construct an RMI connection directly by using the appropriate
-      constructor of {@link javax.management.remote.rmi.RMIConnector
-      RMIConnector}.</p>
-
-    <h2>Dynamic code downloading</h2>
-
-    <p>If an RMI connector client or server receives from its peer an
-      instance of a class that it does not know, and if dynamic code
-      downloading is active for the RMI connection, then the class can
-      be downloaded from a codebase specified by the peer.
-      {@extLink rmi_guide Java RMI Guide} explains this in more detail.</p>
-
-    @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045,
-    section 6.8, "Base64 Content-Transfer-Encoding"</a>
-
-
-    @since 1.5
-
-  </body>
-</html>
diff --git a/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java
index a7c2c49df83..34286939f8a 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -161,6 +161,14 @@ enum Kind {
          */
         LITERAL("literal"),
 
+        /**
+         * Used for instances of {@link RawTextTree}
+         * representing a fragment of Markdown content.
+         *
+         * @since 23
+         */
+        MARKDOWN,
+
         /**
          * Used for instances of {@link ParamTree}
          * representing an {@code @param} tag.
diff --git a/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java
index d7ddbe30d9e..da0d149e9e1 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -247,6 +247,22 @@ default R visitProvides(ProvidesTree node, P p) {
         return visitOther(node, p);
     }
 
+    /**
+     * Visits a {@code RawTextTree} node.
+     *
+     * @implSpec Visits the provided {@code RawTextTree} node
+     * by calling {@code visitOther(node, p)}.
+     *
+     * @param node the node being visited
+     * @param p a parameter value
+     * @return a result value
+     *
+     * @since 23
+     */
+    default R visitRawText(RawTextTree node, P p) {
+        return visitOther(node, p);
+    }
+
     /**
      * Visits a {@code ReferenceTree} node.
      * @param node the node being visited
diff --git a/src/jdk.compiler/share/classes/com/sun/source/doctree/InheritDocTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/InheritDocTree.java
index 7d3624413ed..0df2c0db028 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/doctree/InheritDocTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/doctree/InheritDocTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,11 @@
  *    {&#064;inheritDoc supertype}
  * </pre>
  *
+ * @apiNote
+ * There is no requirement that the comment containing the tag and the comment
+ * containing the inherited documentation should either be both Markdown comments
+ * or both traditional (not Markdown) comments.
+ *
  * @since 1.8
  */
 public interface InheritDocTree extends InlineTagTree {
diff --git a/src/jdk.compiler/share/classes/com/sun/source/doctree/RawTextTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/RawTextTree.java
new file mode 100644
index 00000000000..e2a02b42cb9
--- /dev/null
+++ b/src/jdk.compiler/share/classes/com/sun/source/doctree/RawTextTree.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.source.doctree;
+
+/**
+ * A tree node for a fragment of uninterpreted raw text content.
+ *
+ * <p>
+ * The content may contain any text except that for
+ * {@linkplain InlineTagTree inline tags}.
+ *
+ * <p>The format of the content is indicated by the {@linkplain #getKind() kind}
+ * of the tree node.
+ *
+ * @apiNote
+ * This class may be used to represent tree nodes containing
+ * {@linkplain DocTree.Kind#MARKDOWN Markdown} text.
+ * Such nodes will typically exist in a list of {@code DocTree} nodes,
+ * along with other kinds of {@code DocTree} nodes, such as for inline tags.
+ * When processing any such list, any non-Markdown nodes will be processed
+ * recursively first, and then treated as opaque objects within the remaining
+ * stream of Markdown nodes. Thus, the content of any non-Markdown nodes will
+ * not affect how the Markdown nodes will be processed.
+ *
+ * @since 23
+ */
+public interface RawTextTree extends DocTree {
+    /**
+     * {@return the content}
+     */
+    String getContent();
+}
diff --git a/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java
index e4794e7be94..22be135e696 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * trees (AST).
  *
  * @spec javadoc/doc-comment-spec.html Documentation Comment Specification for the Standard Doclet
- * @author Jonathan Gibbons
  * @since 1.8
  *
  */
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java
index facdb8efdaf..62fa36fa6b7 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java
@@ -61,7 +61,8 @@ public interface CaseTree extends Tree {
      * For default case, returns an empty list.
      *
      * @return labels for this case
-     * @since 12
+     *
+     * @since 14
      */
     List<? extends ExpressionTree> getExpressions();
 
@@ -98,7 +99,8 @@ public interface CaseTree extends Tree {
      * {@linkplain CaseKind#STATEMENT}.
      *
      * @return case value or null
-     * @since 12
+     *
+     * @since 14
      */
     public default Tree getBody() {
         return null;
@@ -108,7 +110,8 @@ public default Tree getBody() {
      * Returns the kind of this case.
      *
      * @return the kind of this case
-     * @since 12
+     *
+     * @since 14
      */
     public default CaseKind getCaseKind() {
         return CaseKind.STATEMENT;
@@ -121,7 +124,7 @@ public default CaseKind getCaseKind() {
      *     <li>RULE: {@code case <expression> -> <expression>/<statement>}</li>
      * </ul>
      *
-     * @since 12
+     * @since 14
      */
     public enum CaseKind {
         /**
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java
index 4a60ea53f99..2327c7a3f49 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java
@@ -39,7 +39,7 @@
  *
  * @jls 15.29 Switch Expressions
  *
- * @since 12
+ * @since 14
  */
 public interface SwitchExpressionTree extends ExpressionTree {
     /**
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
index 0bd3823307b..4b7df6185d6 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
@@ -284,7 +284,7 @@ public enum Kind {
         /**
          * Used for instances of {@link SwitchExpressionTree}.
          *
-         * @since 12
+         * @since 14
          */
         SWITCH_EXPRESSION(SwitchExpressionTree.class),
 
@@ -702,7 +702,7 @@ public enum Kind {
         /**
          * Used for instances of {@link YieldTree}.
          *
-         * @since 13
+         * @since 14
          */
         YIELD(YieldTree.class);
 
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
index 3f7a683350c..b7851d8ff9a 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
@@ -413,7 +413,8 @@ public interface TreeVisitor<R,P> {
      * @param node the node being visited
      * @param p a parameter value
      * @return a result value
-     * @since 12
+     *
+     * @since 14
      */
     R visitSwitchExpression(SwitchExpressionTree node, P p);
 
@@ -608,7 +609,8 @@ public interface TreeVisitor<R,P> {
      * @param node the node being visited
      * @param p a parameter value
      * @return a result value
-     * @since 13
+     *
+     * @since 14
      */
     R visitYield(YieldTree node, P p);
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/YieldTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/YieldTree.java
index 181d0495774..eeda36d84ae 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/YieldTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/YieldTree.java
@@ -35,7 +35,7 @@
  *
  * @jls 14.21 The yield Statement
  *
- * @since 13
+ * @since 14
  */
 public interface YieldTree extends StatementTree {
 
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java b/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java
index 391acfdfb6e..610c685f848 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,7 @@
 import com.sun.source.doctree.InheritDocTree;
 import com.sun.source.doctree.LinkTree;
 import com.sun.source.doctree.LiteralTree;
+import com.sun.source.doctree.RawTextTree;
 import com.sun.source.doctree.ParamTree;
 import com.sun.source.doctree.ProvidesTree;
 import com.sun.source.doctree.ReferenceTree;
@@ -289,6 +290,18 @@ default InheritDocTree newInheritDocTree(ReferenceTree supertype) {
      */
     ProvidesTree newProvidesTree(ReferenceTree name, List<? extends DocTree> description);
 
+    /**
+     * Creates a new {@code RawTextTree} object, to represent a fragment of uninterpreted raw text.
+     *
+     * @param kind the kind of text
+     * @param code the code
+     * @return a {@code RawTextTree} object
+     * @throws IllegalArgumentException if the kind is not a recognized kind for raw text
+     *
+     * @since 23
+     */
+    RawTextTree newRawTextTree(DocTree.Kind kind, String code);
+
     /**
      * Creates a new {@code ReferenceTree} object, to represent a reference to an API element.
      *
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java b/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java
index cde78ea467c..d2d0753dbf2 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -229,6 +229,8 @@ public R visitDocRoot(DocRootTree node, P p) {
      * @param node  {@inheritDoc}
      * @param p  {@inheritDoc}
      * @return the result of scanning
+     *
+     * @since 10
      */
     @Override
     public R visitDocType(DocTypeTree node, P p) {
@@ -413,6 +415,22 @@ public R visitProvides(ProvidesTree node, P p) {
         return r;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @implSpec This implementation returns {@code null}.
+     *
+     * @param node  {@inheritDoc}
+     * @param p  {@inheritDoc}
+     * @return the result of scanning
+     *
+     * @since 23
+     */
+    @Override
+    public R visitRawText(RawTextTree node, P p) {
+        return null;
+    }
+
     /**
      * {@inheritDoc}
      *
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java b/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java
index ecad91f76c9..45a452bd0dd 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,10 +28,12 @@
 import java.io.IOException;
 import java.text.BreakIterator;
 import java.util.List;
+
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Elements.DocCommentKind;
 import javax.tools.Diagnostic;
 import javax.tools.FileObject;
 import javax.tools.JavaCompiler.CompilationTask;
@@ -84,6 +86,16 @@ public static DocTrees instance(ProcessingEnvironment env) {
      */
     public abstract BreakIterator getBreakIterator();
 
+    /**
+     * {@return the style of the documentation comment associated with a tree node}
+     *
+     * @param path the path for the tree node
+     *
+     * @see Trees#getPath(Element)
+     * @since 23
+     */
+    public abstract DocCommentKind getDocCommentKind(TreePath path);
+
     /**
      * Returns the doc comment tree, if any, for the Tree node identified by a given TreePath.
      * Returns {@code null} if no doc comment was found.
@@ -113,10 +125,14 @@ public static DocTrees instance(ProcessingEnvironment env) {
     public abstract DocCommentTree getDocCommentTree(Element e);
 
     /**
-     * Returns the doc comment tree of the given file. The file must be
-     * an HTML file, in which case the doc comment tree represents the
-     * entire contents of the file.
-     * Returns {@code null} if no doc comment was found.
+     * Returns the doc comment tree of the given file, which must
+     * be of one of the supported file types.
+     *
+     * <p>The supported file types are:
+     * <ul>
+     * <li>HTML files, identified by a file name ending in {@code .html},
+     * <li>Markdown files, identified by a file name ending in {@code .md}.
+     * </ul>
      * Future releases may support additional file types.
      *
      * @implNote The default implementation of this method returns a
@@ -124,16 +140,22 @@ public static DocTrees instance(ProcessingEnvironment env) {
      *
      * @param fileObject the content container
      * @return the doc comment tree
+     * @throws IllegalArgumentException if the file type is not supported
+     *
      * @since 9
      */
     public abstract DocCommentTree getDocCommentTree(FileObject fileObject);
 
     /**
-     * Returns the doc comment tree of the given file whose path is
-     * specified relative to the given element. The file must be an HTML
-     * file, in which case the doc comment tree represents the contents
-     * of the &lt;body&gt; tag, and any enclosing tags are ignored.
-     * Returns {@code null} if no doc comment was found.
+     * Returns the doc comment tree of the given file, which must
+     * be of one of the supported file types, and whose path is
+     * specified relative to the given element.
+     *
+     * <p>The supported file types are:
+     * <ul>
+     * <li>HTML files, identified by a file name ending in {@code .html},
+     * <li>Markdown files, identified by a file name ending in {@code .md}.
+     * </ul>
      * Future releases may support additional file types.
      *
      * @implNote The default implementation of this method returns a
@@ -142,16 +164,20 @@ public static DocTrees instance(ProcessingEnvironment env) {
      * @param e an element whose path is used as a reference
      * @param relativePath the relative path from the Element
      * @return the doc comment tree
-     * @throws java.io.IOException if an exception occurs
+     * @throws IOException if an exception occurs
+     * @throws IllegalArgumentException if the file type is not supported
      *
      * @since 9
      */
     public abstract DocCommentTree getDocCommentTree(Element e, String relativePath) throws IOException;
 
     /**
-     * Returns a doc tree path containing the doc comment tree of the given file.
-     * The file must be an HTML file, in which case the doc comment tree represents
-     * the contents of the {@code <body>} tag, and any enclosing tags are ignored.
+     * Returns a doc tree path containing the doc comment tree of the given file,
+     * which must be of one of the supported file types.
+     *
+     * Supported file types are HTML files and Markdown files.
+     * Future releases may support additional file types.
+     *
      * Any references to source code elements contained in {@code @see} and
      * {@code {@link}} tags in the doc comment tree will be evaluated in the
      * context of the given package element.
@@ -161,7 +187,7 @@ public static DocTrees instance(ProcessingEnvironment env) {
      * @param packageElement a package element to associate with the given file object
      * representing a legacy package.html, null otherwise
      * @return a doc tree path containing the doc comment parsed from the given file
-     * @throws IllegalArgumentException if the fileObject is not an HTML file
+     * @throws IllegalArgumentException if the file type is not supported
      *
      * @since 9
      */
@@ -250,6 +276,8 @@ public abstract void printMessage(Diagnostic.Kind kind, CharSequence msg,
      * @param tree the tree containing the entity
      * @return a string containing the characters
      * @spec https://www.w3.org/TR/html52 HTML Standard
+     *
+     * @since 16
      */
     public abstract String getCharacters(EntityTree tree);
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/Plugin.java b/src/jdk.compiler/share/classes/com/sun/source/util/Plugin.java
index 9a41396d84d..aee626929f4 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/Plugin.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/Plugin.java
@@ -74,6 +74,8 @@ public interface Plugin {
      * command-line option.
      *
      * @return whether or not this plugin should be automatically started
+     *
+     * @since 14
      */
     default boolean autoStart() {
         return false;
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java
index bdd6225c869..77ecb5535a1 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -366,6 +366,22 @@ public R visitProvides(ProvidesTree node, P p) {
         return defaultAction(node, p);
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @implSpec This implementation calls {@code defaultAction}.
+     *
+     * @param node {@inheritDoc}
+     * @param p {@inheritDoc}
+     * @return  the result of {@code defaultAction}
+     *
+     * @since 23
+     */
+    @Override
+    public R visitRawText(RawTextTree node, P p) {
+        return defaultAction(node, p);
+    }
+
     /**
      * {@inheritDoc}
      *
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java
index 5179061b4bb..1a123a49faa 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java
@@ -299,6 +299,8 @@ public R visitSwitch(SwitchTree node, P p) {
      * @param node {@inheritDoc}
      * @param p {@inheritDoc}
      * @return  the result of {@code defaultAction}
+     *
+     * @since 14
      */
     @Override
     public R visitSwitchExpression(SwitchExpressionTree node, P p) {
@@ -1047,6 +1049,8 @@ public R visitOther(Tree node, P p) {
      * @param node {@inheritDoc}
      * @param p {@inheritDoc}
      * @return  the result of {@code defaultAction}
+     *
+     * @since 14
      */
     @Override
     public R visitYield(YieldTree node, P p) {
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java b/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java
index 49bec302100..4327c6f5f31 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java
@@ -376,6 +376,8 @@ public R visitSwitch(SwitchTree node, P p) {
      * @param node  {@inheritDoc}
      * @param p  {@inheritDoc}
      * @return the result of scanning
+     *
+     * @since 14
      */
     @Override
     public R visitSwitchExpression(SwitchExpressionTree node, P p) {
@@ -1200,6 +1202,8 @@ public R visitErroneous(ErroneousTree node, P p) {
      * @param node  {@inheritDoc}
      * @param p  {@inheritDoc}
      * @return the result of scanning
+     *
+     * @since 14
      */
     @Override
     public R visitYield(YieldTree node, P p) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
index 45c76071f8b..8f84f5d7fbd 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
@@ -32,6 +32,7 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.WeakHashMap;
 
@@ -48,6 +49,7 @@
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Elements.DocCommentKind;
 import javax.tools.Diagnostic;
 import javax.tools.FileObject;
 import javax.tools.ForwardingFileObject;
@@ -67,7 +69,6 @@
 import com.sun.source.tree.Tree;
 import com.sun.source.util.DocSourcePositions;
 import com.sun.source.util.DocTreePath;
-import com.sun.source.util.DocTreeScanner;
 import com.sun.source.util.DocTrees;
 import com.sun.source.util.JavacTask;
 import com.sun.source.util.TreePath;
@@ -100,6 +101,7 @@
 import com.sun.tools.javac.model.JavacElements;
 import com.sun.tools.javac.parser.DocCommentParser;
 import com.sun.tools.javac.parser.ParserFactory;
+import com.sun.tools.javac.parser.ReferenceParser;
 import com.sun.tools.javac.parser.Tokens.Comment;
 import com.sun.tools.javac.processing.JavacProcessingEnvironment;
 import com.sun.tools.javac.resources.CompilerProperties.Errors;
@@ -169,10 +171,12 @@ public class JavacTrees extends DocTrees {
     private final Types types;
     private final DocTreeMaker docTreeMaker;
     private final JavaFileManager fileManager;
-    private final ParserFactory parser;
     private final Symtab syms;
 
     private BreakIterator breakIterator;
+    private final ParserFactory parserFactory;
+
+    private DocCommentTreeTransformer docCommentTreeTransformer;
 
     private final Map<Type, Type> extraType2OriginalMap = new WeakHashMap<>();
 
@@ -214,7 +218,7 @@ protected JavacTrees(Context context) {
         names = Names.instance(context);
         types = Types.instance(context);
         docTreeMaker = DocTreeMaker.instance(context);
-        parser = ParserFactory.instance(context);
+        parserFactory = ParserFactory.instance(context);
         syms = Symtab.instance(context);
         fileManager = context.get(JavaFileManager.class);
         var task = context.get(JavacTask.class);
@@ -261,20 +265,6 @@ public DocTreeMaker getDocTreeFactory() {
         return docTreeMaker;
     }
 
-    private DocTree getLastChild(DocTree tree) {
-        final DocTree[] last = new DocTree[] {null};
-
-        tree.accept(new DocTreeScanner<Void, Void>() {
-            @Override @DefinedBy(Api.COMPILER_TREE)
-            public Void scan(DocTree node, Void p) {
-                if (node != null) last[0] = node;
-                return null;
-            }
-        }, null);
-
-        return last[0];
-    }
-
     @Override @DefinedBy(Api.COMPILER_TREE)
     public JCClassDecl getTree(TypeElement element) {
         return (JCClassDecl) getTree((Element) element);
@@ -723,8 +713,8 @@ private boolean hasParameterTypes(MethodSymbol method, List<Type> paramTypes, bo
 
     @Override @DefinedBy(Api.COMPILER_TREE)
     public TypeMirror getTypeMirror(TreePath path) {
-        Tree t = path.getLeaf();
-        Type ty = ((JCTree)t).type;
+        Tree leaf = path.getLeaf();
+        Type ty = ((JCTree) leaf).type;
         return ty == null ? null : ty.stripMetadataIfNeeded();
     }
 
@@ -733,26 +723,40 @@ public JavacScope getScope(TreePath path) {
         return JavacScope.create(getAttrContext(path));
     }
 
+    @Override @DefinedBy(Api.COMPILER_TREE)
+    public DocCommentKind getDocCommentKind(TreePath path) {
+        var compUnit = path.getCompilationUnit();
+        var leaf = path.getLeaf();
+        if (compUnit instanceof JCTree.JCCompilationUnit cu && leaf instanceof JCTree l
+                && cu.docComments != null) {
+            Comment c = cu.docComments.getComment(l);
+            return (c == null) ? null : switch (c.getStyle()) {
+                case JAVADOC_BLOCK -> DocCommentKind.TRADITIONAL;
+                case JAVADOC_LINE -> DocCommentKind.END_OF_LINE;
+                default -> null;
+            };
+        }
+        return null;
+    }
+
     @Override @DefinedBy(Api.COMPILER_TREE)
     public String getDocComment(TreePath path) {
-        CompilationUnitTree t = path.getCompilationUnit();
-        Tree leaf = path.getLeaf();
-        if (t instanceof JCTree.JCCompilationUnit compilationUnit && leaf instanceof JCTree tree) {
-            if (compilationUnit.docComments != null) {
-                return compilationUnit.docComments.getCommentText(tree);
-            }
+        var compUnit = path.getCompilationUnit();
+        var leaf = path.getLeaf();
+        if (compUnit instanceof JCTree.JCCompilationUnit cu && leaf instanceof JCTree l
+                && cu.docComments != null) {
+            return cu.docComments.getCommentText(l);
         }
         return null;
     }
 
     @Override @DefinedBy(Api.COMPILER_TREE)
     public DocCommentTree getDocCommentTree(TreePath path) {
-        CompilationUnitTree t = path.getCompilationUnit();
-        Tree leaf = path.getLeaf();
-        if (t instanceof JCTree.JCCompilationUnit compilationUnit && leaf instanceof JCTree tree) {
-            if (compilationUnit.docComments != null) {
-                return compilationUnit.docComments.getCommentTree(tree);
-            }
+        var compUnit = path.getCompilationUnit();
+        var leaf = path.getLeaf();
+        if (compUnit instanceof JCTree.JCCompilationUnit cu && leaf instanceof JCTree l
+                && cu.docComments != null) {
+            return cu.docComments.getCommentTree(l);
         }
         return null;
     }
@@ -990,33 +994,40 @@ public void visitVarDef(JCVariableDecl tree) {
         return flatNameForClass;
     }
 
-    static JavaFileObject asJavaFileObject(FileObject fileObject) {
-        JavaFileObject jfo = null;
-
-        if (fileObject instanceof JavaFileObject javaFileObject) {
-            checkHtmlKind(fileObject, Kind.HTML);
-            return javaFileObject;
-        }
-
-        checkHtmlKind(fileObject);
-        jfo = new HtmlFileObject(fileObject);
-        return jfo;
+    private static boolean isHtmlFile(FileObject fo) {
+        return fo.getName().endsWith(".html");
     }
 
-    private static void checkHtmlKind(FileObject fileObject) {
-        checkHtmlKind(fileObject, BaseFileManager.getKind(fileObject.getName()));
+    private static boolean isMarkdownFile(FileObject fo) {
+        return fo.getName().endsWith(".md");
     }
 
-    private static void checkHtmlKind(FileObject fileObject, JavaFileObject.Kind kind) {
-        if (kind != JavaFileObject.Kind.HTML) {
-            throw new IllegalArgumentException("HTML file expected:" + fileObject.getName());
+
+    static JavaFileObject asDocFileObject(FileObject fo) {
+        if (fo instanceof JavaFileObject jfo) {
+            switch (jfo.getKind()) {
+                case HTML -> {
+                    return jfo;
+                }
+                case OTHER -> {
+                    if (isMarkdownFile(jfo)) {
+                        return jfo;
+                    }
+                }
+            }
+        } else {
+            if (isHtmlFile(fo) || isMarkdownFile(fo)) {
+                return new DocFileObject(fo);
+            }
         }
+
+        throw new IllegalArgumentException(("Not a documentation file: " + fo.getName()));
     }
 
-    private static class HtmlFileObject extends ForwardingFileObject<FileObject>
+    private static class DocFileObject extends ForwardingFileObject<FileObject>
             implements JavaFileObject {
 
-        public HtmlFileObject(FileObject fileObject) {
+        public DocFileObject(FileObject fileObject) {
             super(fileObject);
         }
 
@@ -1043,7 +1054,7 @@ public Modifier getAccessLevel() {
 
     @Override @DefinedBy(Api.COMPILER_TREE)
     public DocCommentTree getDocCommentTree(FileObject fileObject) {
-        JavaFileObject jfo = asJavaFileObject(fileObject);
+        JavaFileObject jfo = asDocFileObject(fileObject);
         DiagnosticSource diagSource = new DiagnosticSource(jfo, log);
 
         final Comment comment = new Comment() {
@@ -1071,21 +1082,26 @@ public int getSourcePos(int index) {
 
             @Override
             public CommentStyle getStyle() {
-                throw new UnsupportedOperationException();
+                return isHtmlFile(fileObject) ? CommentStyle.JAVADOC_BLOCK
+                        : isMarkdownFile(fileObject) ? CommentStyle.JAVADOC_LINE
+                        : null;
             }
 
             @Override
             public boolean isDeprecated() {
-                throw new UnsupportedOperationException();
+                return false;
             }
         };
 
-        return new DocCommentParser(parser, diagSource, comment, true).parse();
+        boolean isHtmlFile = jfo.getKind() == Kind.HTML;
+
+        var dct = new DocCommentParser(parserFactory, diagSource, comment, isHtmlFile).parse();
+        return transform(dct);
     }
 
     @Override @DefinedBy(Api.COMPILER_TREE)
     public DocTreePath getDocTreePath(FileObject fileObject, PackageElement packageElement) {
-        JavaFileObject jfo = asJavaFileObject(fileObject);
+        JavaFileObject jfo = asDocFileObject(fileObject);
         DocCommentTree docCommentTree = getDocCommentTree(jfo);
         if (docCommentTree == null)
             return null;
@@ -1103,6 +1119,103 @@ public String getCharacters(EntityTree tree) {
         return Entity.getCharacters(tree);
     }
 
+    /**
+     * {@return the doc comment tree for a given comment}
+     *
+     * @param diagSource the source containing the comment, used when displaying any diagnostics
+     * @param c the comment
+     */
+    public DocCommentTree getDocCommentTree(DiagnosticSource diagSource, Comment c) {
+        var dct = new DocCommentParser(parserFactory, diagSource, c).parse();
+        return transform(dct);
+    }
+
+    /**
+     * An interface for transforming a {@code DocCommentTree}.
+     * It is primarily used as the service-provider interface for an implementation
+     * that embodies the JDK extensions to CommonMark, such as reference links to
+     * program elements.
+     */
+    public interface DocCommentTreeTransformer {
+        /**
+         * The name used by the implementation that embodies the JDK extensions to CommonMark.
+         */
+        public final String STANDARD = "standard";
+
+        /**
+         * {@return the name of this transformer}
+         */
+        String name();
+
+        /**
+         * Transforms a documentation comment tree.
+         *
+         * @param trees an instance of the {@link DocTrees} utility interface.
+         * @param tree the tree to be transformed
+         * @return the transformed tree
+         */
+        DocCommentTree transform(DocTrees trees, DocCommentTree tree);
+    }
+
+    /**
+     * A class that provides the identity transform on instances of {@code DocCommentTree}.
+     */
+    public static class IdentityTransformer implements DocCommentTreeTransformer {
+        @Override
+        public String name() {
+            return "identity";
+        }
+
+        @Override
+        public DocCommentTree transform(DocTrees trees, DocCommentTree tree) {
+            return tree;
+        }
+    }
+
+    public DocCommentTreeTransformer getDocCommentTreeTransformer() {
+        return docCommentTreeTransformer;
+    }
+
+    public void setDocCommentTreeTransformer(DocCommentTreeTransformer transformer) {
+        docCommentTreeTransformer = transformer;
+    }
+
+    /**
+     * Initialize {@link #docCommentTreeTransformer} if it is {@code null},
+     * using a service provider to look up an implementation with the name "standard".
+     * If none is found, an identity transformer is used, with the name "identity".
+     */
+    public void initDocCommentTreeTransformer() {
+        if (docCommentTreeTransformer == null) {
+            var sl = ServiceLoader.load(DocCommentTreeTransformer.class);
+            docCommentTreeTransformer = sl.stream()
+                    .map(ServiceLoader.Provider::get)
+                    .filter(t -> t.name().equals(DocCommentTreeTransformer.STANDARD))
+                    .findFirst()
+                    .orElseGet(() -> new IdentityTransformer());
+        }
+    }
+
+    /**
+     * Transforms the given tree using the current {@linkplain #getDocCommentTreeTransformer() transformer},
+     * after ensuring it has been {@linkplain #initDocCommentTreeTransformer() initialized}.
+     *
+     * @param tree the tree
+     * @return the transformed tree
+     */
+    private DocCommentTree transform(DocCommentTree tree) {
+        initDocCommentTreeTransformer();
+        return docCommentTreeTransformer.transform(this, tree);
+    }
+
+    /**
+     * {@return the {@linkplain ParserFactory} parser factory}
+     * The factory can be used to create a {@link ReferenceParser}, to parse link references.
+     */
+    public ParserFactory getParserFactory() {
+        return parserFactory;
+    }
+
     /**
      * Makes a copy of a tree, noting the value resulting from copying a particular leaf.
      **/
@@ -1206,20 +1319,10 @@ private void printMessage(Diagnostic.Kind kind, CharSequence msg,
 
         try {
             switch (kind) {
-            case ERROR:
-                log.error(DiagnosticFlag.API, pos, Errors.ProcMessager(msg.toString()));
-                break;
-
-            case WARNING:
-                log.warning(pos, Warnings.ProcMessager(msg.toString()));
-                break;
-
-            case MANDATORY_WARNING:
-                log.mandatoryWarning(pos, Warnings.ProcMessager(msg.toString()));
-                break;
-
-            default:
-                log.note(pos, Notes.ProcMessager(msg.toString()));
+                case ERROR ->             log.error(DiagnosticFlag.API, pos, Errors.ProcMessager(msg.toString()));
+                case WARNING ->           log.warning(pos, Warnings.ProcMessager(msg.toString()));
+                case MANDATORY_WARNING -> log.mandatoryWarning(pos, Warnings.ProcMessager(msg.toString()));
+                default ->                log.note(pos, Notes.ProcMessager(msg.toString()));
             }
         } finally {
             if (oldSource != null)
@@ -1272,6 +1375,11 @@ public Comment getComment(JCTree tree) {
                 throw new UnsupportedOperationException();
             }
 
+            @Override
+            public DocCommentKind getCommentKind(JCTree tree) {
+                throw new UnsupportedOperationException();
+            }
+
             @Override
             public String getCommentText(JCTree tree) {
                 throw new UnsupportedOperationException();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
index ef62222438b..ca420eecdc5 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
@@ -1552,9 +1552,11 @@ public RecordComponent findRecordComponentToRemove(JCVariableDecl var) {
             RecordComponent toRemove = null;
             for (RecordComponent rc : recordComponents) {
                 /* it could be that a record erroneously declares two record components with the same name, in that
-                 * case we need to use the position to disambiguate
+                 * case we need to use the position to disambiguate, but if we loaded the record from a class file
+                 * all positions will be -1, in that case we have to ignore the position and match only based on the
+                 * name
                  */
-                if (rc.name == var.name && var.pos == rc.pos) {
+                if (rc.name == var.name && (var.pos == rc.pos || rc.pos == -1)) {
                     toRemove = rc;
                 }
             }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
index 4b2f32521a3..28768f2517b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
@@ -4734,6 +4734,10 @@ class Rewriter extends UnaryVisitor<Type> {
 
         boolean high;
         boolean rewriteTypeVars;
+        // map to avoid visiting same type argument twice, like in Foo<T>.Bar<T>
+        Map<Type, Type> argMap = new HashMap<>();
+        // cycle detection within an argument, see JDK-8324809
+        Set<Type> seen = new HashSet<>();
 
         Rewriter(boolean high, boolean rewriteTypeVars) {
             this.high = high;
@@ -4745,7 +4749,10 @@ public Type visitClassType(ClassType t, Void s) {
             ListBuffer<Type> rewritten = new ListBuffer<>();
             boolean changed = false;
             for (Type arg : t.allparams()) {
-                Type bound = visit(arg);
+                Type bound = argMap.get(arg);
+                if (bound == null) {
+                    argMap.put(arg, bound = visit(arg));
+                }
                 if (arg != bound) {
                     changed = true;
                 }
@@ -4774,13 +4781,17 @@ public Type visitCapturedType(CapturedType t, Void s) {
 
         @Override
         public Type visitTypeVar(TypeVar t, Void s) {
-            if (rewriteTypeVars) {
-                Type bound = t.getUpperBound().contains(t) ?
-                        erasure(t.getUpperBound()) :
-                        visit(t.getUpperBound());
-                return rewriteAsWildcardType(bound, t, EXTENDS);
+            if (seen.add(t)) {
+                if (rewriteTypeVars) {
+                    Type bound = t.getUpperBound().contains(t) ?
+                            erasure(t.getUpperBound()) :
+                            visit(t.getUpperBound());
+                    return rewriteAsWildcardType(bound, t, EXTENDS);
+                } else {
+                    return t;
+                }
             } else {
-                return t;
+                return rewriteTypeVars ? makeExtendsWildcard(syms.objectType, t) : t;
             }
         }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
index d98aad1e9d8..4d9f0012733 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
@@ -4428,7 +4428,7 @@ public void checkImportedPackagesObservable(final JCCompilationUnit toplevel) {
                 TypeSymbol tsym = imp.qualid.selected.type.tsym;
                 if (tsym.kind == PCK && tsym.members().isEmpty() &&
                     !(Feature.IMPORT_ON_DEMAND_OBSERVABLE_PACKAGES.allowedInSource(source) && tsym.exists())) {
-                    log.error(DiagnosticFlag.RESOLVE_ERROR, imp.pos, Errors.DoesntExist(tsym));
+                    log.error(DiagnosticFlag.RESOLVE_ERROR, imp.qualid.selected.pos(), Errors.DoesntExist(tsym));
                 }
             }
         }
@@ -4818,7 +4818,6 @@ void checkSwitchCaseLabelDominated(JCCaseLabel unconditionalCaseLabel, List<JCCa
                     JCCaseLabel testCaseLabel = caseAndLabel.snd;
                     Type testType = labelType(testCaseLabel);
                     boolean dominated = false;
-                    if (unconditionalCaseLabel == testCaseLabel) unconditionalFound = true;
                     if (types.isUnconditionallyExact(currentType, testType) &&
                         !currentType.hasTag(ERROR) && !testType.hasTag(ERROR)) {
                         //the current label is potentially dominated by the existing (test) label, check:
@@ -4833,11 +4832,6 @@ void checkSwitchCaseLabelDominated(JCCaseLabel unconditionalCaseLabel, List<JCCa
                         }
                     }
 
-                    // Domination can occur even when we have not an unconditional pair between case labels.
-                    if (unconditionalFound && unconditionalCaseLabel != label) {
-                        dominated = true;
-                    }
-
                     if (dominated) {
                         log.error(label.pos(), Errors.PatternDominated);
                     }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
index e49ce45240a..cec23aea0b7 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -381,6 +381,8 @@ protected void help(Log log) {
 
     PREVIEW("--enable-preview", "opt.preview", STANDARD, BASIC),
 
+    DISABLE_LINE_DOC_COMMENTS("--disable-line-doc-comments", "opt.lineDocComments", EXTENDED, BASIC),
+
     PROFILE("-profile", "opt.arg.profile", "opt.profile", STANDARD, BASIC) {
         @Override
         public void process(OptionHelper helper, String option, String operand) throws InvalidValueException {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java
index bdd25c066e5..7cf419f3ca8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 
 import javax.lang.model.AnnotatedConstruct;
@@ -61,6 +62,7 @@
 import com.sun.tools.javac.comp.Env;
 import com.sun.tools.javac.main.JavaCompiler;
 import com.sun.tools.javac.processing.PrintingProcessor;
+import com.sun.tools.javac.tree.DocCommentTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.*;
 import com.sun.tools.javac.tree.TreeInfo;
@@ -74,7 +76,6 @@
 import com.sun.tools.javac.comp.Attr;
 import com.sun.tools.javac.comp.Modules;
 import com.sun.tools.javac.comp.Resolve;
-import com.sun.tools.javac.comp.Resolve.RecoveryLoadClass;
 import com.sun.tools.javac.resources.CompilerProperties.Notes;
 import static com.sun.tools.javac.tree.JCTree.Tag.*;
 
@@ -433,6 +434,15 @@ public JCTree getTree(Element e) {
 
     @DefinedBy(Api.LANGUAGE_MODEL)
     public String getDocComment(Element e) {
+        return getDocCommentItem(e, ((docCommentTable, tree) -> docCommentTable.getCommentText(tree)));
+    }
+
+    @DefinedBy(Api.LANGUAGE_MODEL)
+    public DocCommentKind getDocCommentKind(Element e) {
+        return getDocCommentItem(e, ((docCommentTable, tree) -> docCommentTable.getCommentKind(tree)));
+    }
+
+    private <R> R getDocCommentItem(Element e, BiFunction<DocCommentTable, JCTree, R> f) {
         // Our doc comment is contained in a map in our toplevel,
         // indexed by our tree.  Find our enter environment, which gives
         // us our toplevel.  It also gives us a tree that contains our
@@ -444,7 +454,7 @@ public String getDocComment(Element e) {
         JCCompilationUnit toplevel = treeTop.snd;
         if (toplevel.docComments == null)
             return null;
-        return toplevel.docComments.getCommentText(tree);
+        return f.apply(toplevel.docComments, tree);
     }
 
     @DefinedBy(Api.LANGUAGE_MODEL)
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
index 603e7c42807..acd79c69bd4 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,13 @@
 package com.sun.tools.javac.parser;
 
 import java.io.Serial;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import com.sun.source.doctree.AttributeTree.ValueKind;
+import com.sun.source.doctree.DocTree;
 import com.sun.source.doctree.ErroneousTree;
 import com.sun.source.doctree.UnknownBlockTagTree;
 import com.sun.source.doctree.UnknownInlineTagTree;
@@ -76,7 +79,27 @@ static class ParseException extends Exception {
         }
     }
 
-    private enum Phase { PREAMBLE, BODY, POSTAMBLE }
+    /**
+     * An indication of the part of documentation comment or file being read.
+     * A documentation comment and a Markdown file just have a {@code BODY}.
+     * An HTML file has a {@code PREAMBLE}, {@code BODY} and {@code POSTAMBLE}.
+     * While parsing a {@code BODY}, text within {@code {@tag ... }} may be
+     * read as {@code INLINE}.
+     * One of the primary characteristics of each "phase" is the termination
+     * condition, indicating when the current phase is complete, and either
+     * the previous one resumed (in the case of {@code INLINE}) or the
+     * next phase started.
+     */
+    private enum Phase {
+        /** The initial part of an HTML file up to and including the {@code body} and possible {@code <main>} tag. */
+        PREAMBLE,
+        /** The initial part of a doc comment, or the rich-text content of a block tag. */
+        BODY,
+        /** The end of an HTML file, from and including the {@code </main>} or {@code </body>} tag. */
+        POSTAMBLE,
+        /** The rich-text content of an inline documentation comment tag. */
+        INLINE
+    }
 
     private final ParserFactory fac;
     private final JCDiagnostic.Factory diags;
@@ -84,7 +107,9 @@ private enum Phase { PREAMBLE, BODY, POSTAMBLE }
     private final Comment comment;
     private final DocTreeMaker m;
     private final Names names;
-    private final boolean isFileContent;
+    private final boolean isHtmlFile;
+    private final DocTree.Kind textKind;
+    private final Markdown markdown;
 
     /** The input buffer, index of most recent character read,
      *  index of one past last character in buffer.
@@ -103,22 +128,79 @@ private enum Phase { PREAMBLE, BODY, POSTAMBLE }
 
     private final Map<Name, TagParser> tagParsers;
 
+    /**
+     * Creates a parser for a documentation comment.
+     *
+     * @param fac a parser factory, for a doc-tree maker and for reference parsers
+     * @param diagSource the source in which the comment was found
+     * @param comment the comment
+     */
+    public DocCommentParser(ParserFactory fac, DiagnosticSource diagSource, Comment comment) {
+        this(fac, diagSource, comment, false);
+    }
+
+    /**
+     * Creates a parser for a documentation comment.
+     *
+     * If the comment is the content of a standalone HTML file, it will be parsed
+     * in three parts: a preamble (up to and including the {@code <main>} tag,
+     * or {@code <body>} tag if there is no {@code <main>} tag, then the main content
+     * of the file, and then finally the end part of the file starting at the
+     * end tag matching the tag that ended the preamble.
+     *
+     * @param fac a parser factory, for a doc-tree maker and for reference parsers
+     * @param diagSource the source in which the comment was found
+     * @param comment the comment
+     * @param isHtmlFile whether the comment is the entire content of an HTML file
+     */
     public DocCommentParser(ParserFactory fac, DiagnosticSource diagSource,
-                            Comment comment, boolean isFileContent) {
+                            Comment comment, boolean isHtmlFile) {
         this.fac = fac;
         this.diags = fac.log.diags;
         this.diagSource = diagSource;
         this.comment = comment;
         names = fac.names;
-        this.isFileContent = isFileContent;
+        this.isHtmlFile = isHtmlFile;
+        textKind = isHtmlFile ? DocTree.Kind.TEXT : getTextKind(comment);
         m = fac.docTreeMaker;
         tagParsers = createTagParsers();
+        markdown = textKind == DocTree.Kind.MARKDOWN ? new Markdown() : null;
     }
 
-    public DocCommentParser(ParserFactory fac, DiagnosticSource diagSource, Comment comment) {
-        this(fac, diagSource, comment, false);
+    private static DocTree.Kind getTextKind(Comment c) {
+        return switch (c.getStyle()) {
+            case JAVADOC_BLOCK -> DocTree.Kind.TEXT;
+            case JAVADOC_LINE -> DocTree.Kind.MARKDOWN;
+            default -> throw new IllegalArgumentException(c.getStyle().name());
+        };
     }
 
+    /**
+     * {@return the result of parsing the content given to the constructor}
+     *
+     * The parsing rules for "traditional" documentation comments are generally incompatible
+     * with the rules for parsing CommonMark Markdown: traditional comments are parsed
+     * with a simple recursive-descent parser, while CommonMark is parsed in two "phases":
+     * first identifying blocks, and then subsequently parsing the content of those blocks.
+     * The conflict shows up most with the rules for inline tags, some of which may contain
+     * almost arbitrary content, including blank lines in particular.
+     *
+     * We do not want to build and maintain a fully-compliant Markdown parser, nor
+     * can we leverage an existing Markdown parser, such as in commonmark-java,
+     * which cannot handle arbitrary content in "inline" constructs, or the recursive
+     * nature of some inline tags.
+     *
+     * The solution is a compromise. First, we identify inline and block tags,
+     * so that they may be treated as opaque objects when subsequently using a
+     * library (such as commonmark-java) to process the enclosing parts of the
+     * comment. The catch is that while we do not need to provide a full Markdown
+     * parser, we do need to parse it enough to recognize character sequences of
+     * literal code (that is, code spans and code blocks), which should not be
+     * scanned for inline and block tags. Most of this work is handled by the
+     * nested {@link Markdown} class.
+     *
+     * @see <a href="https://spec.commonmark.org/0.30/#blocks-and-inlines">Blocks and Inlines</a>
+     */
     public DCDocComment parse() {
         String c = comment.getText();
         buf = new char[c.length() + 1];
@@ -128,12 +210,13 @@ public DCDocComment parse() {
         bp = -1;
         nextChar();
 
-        List<DCTree> preamble = isFileContent ? blockContent(Phase.PREAMBLE) : List.nil();
-        List<DCTree> body = blockContent(Phase.BODY);
+        List<DCTree> preamble = isHtmlFile ? content(Phase.PREAMBLE) : List.nil();
+        List<DCTree> body = content(Phase.BODY);
         List<DCTree> tags = blockTags();
-        List<DCTree> postamble = isFileContent ? blockContent(Phase.POSTAMBLE) : List.nil();
+        List<DCTree> postamble = isHtmlFile ? content(Phase.POSTAMBLE) : List.nil();
 
-        int pos = !preamble.isEmpty() ? preamble.head.pos
+        int pos = textKind == DocTree.Kind.MARKDOWN ? 0
+                : !preamble.isEmpty() ? preamble.head.pos
                 : !body.isEmpty() ? body.head.pos
                 : !tags.isEmpty() ? tags.head.pos
                 : !postamble.isEmpty() ? postamble.head.pos
@@ -145,7 +228,17 @@ public DCDocComment parse() {
     void nextChar() {
         ch = buf[bp < buflen ? ++bp : buflen];
         switch (ch) {
-            case '\f', '\n', '\r' -> newline = true;
+            case '\n' -> {
+                newline = true;
+            }
+
+            case '\r' -> {
+                if (bp + 1 < buflen && buf[bp + 1] == '\n') {
+                    bp++;
+                    ch = '\n';
+                }
+                newline = true;
+            }
         }
     }
 
@@ -154,74 +247,146 @@ char peekChar() {
     }
 
     protected List<DCTree> blockContent() {
-        return blockContent(Phase.BODY);
+        // The whitespace after a tag name is typically problematic:
+        // should it be included in the content or not?
+        // The problem is made worse by Markdown, in which leading
+        // whitespace in Markdown content may be significant.
+        // While generally in traditional comments, whitespace
+        // after a tag name is skipped, to allow for Markdown we just
+        // skip horizontal whitespace.
+        while (isHorizontalWhitespace(ch) && bp < buflen) {
+            nextChar();
+        }
+        return content(Phase.BODY);
     }
 
     /**
-     * Read block content, consisting of text, html and inline tags.
-     * Terminated by the end of input, or the beginning of the next block tag:
-     * that is, @ as the first non-whitespace character on a line.
+     * Reads "rich text" content, consisting of text, html and inline tags,
+     * according to the given {@code phase}.
+     *
+     * Inline tags are only recognized in {@code BODY} and {@code INLINE}
+     * phases, and not in {@code PREAMBLE} and {@code POSTAMBLE} phases.
+     *
+     * The end of the content is dependent on the phase:
+     *
+     * <ul>
+     * <li>{@code PREAMBLE}: the appearance of {@code <body>} (or {@code <main>}),
+     *      as determined by {@link #isEndPreamble()}
+     * <li>{@code BODY}: the beginning of a block tag, or when reading from
+     *      an HTML file, the appearance of {@code </main>} (or {@code </body>},
+     *      as determined by {@link #isEndBody()}
+     * <li>{@code INLINE}: '}', after skipping any matching {@code { }}
+     * <li>{@code PREAMBLE}: end of file
+     * </ul>
      */
-    @SuppressWarnings("fallthrough")
-    protected List<DCTree> blockContent(Phase phase) {
+    protected List<DCTree> content(Phase phase) {
         ListBuffer<DCTree> trees = new ListBuffer<>();
         textStart = -1;
 
+        int depth = 1;                  // only used when phase is INLINE
+        int pos = bp;                   // only used when phase is INLINE
+
         loop:
         while (bp < buflen) {
             switch (ch) {
-                case '\n': case '\r': case '\f':
-                case ' ': case '\t':
+                case '\n', '\r' -> {
+                    nextChar();
+                    if (textKind == DocTree.Kind.MARKDOWN) {
+                        markdown.update();
+                        if (markdown.isIndentedCodeBlock()) {
+                            markdown.skipLine();
+                        }
+                    }
+                }
+
+                case ' ', '\t' -> {
+                    if (textKind == DocTree.Kind.MARKDOWN && textStart == -1) {
+                        textStart = bp;
+                    }
                     nextChar();
-                    break;
+                }
 
-                case '&':
-                    entity(trees);
-                    break;
 
-                case '<':
-                    newline = false;
-                    if (isFileContent) {
-                        switch (phase) {
-                            case PREAMBLE -> {
-                                if (isEndPreamble()) {
-                                    trees.add(html());
-                                    if (textStart == -1) {
-                                        textStart = bp;
-                                        lastNonWhite = -1;
+                case '&' -> {
+                    switch (textKind) {
+                        case MARKDOWN -> defaultContentCharacter();
+                        case TEXT -> entity(trees);
+                        default -> throw unknownTextKind(textKind);
+                    }
+                }
+
+                case '<' -> {
+                    switch (textKind) {
+                        case MARKDOWN -> {
+                            defaultContentCharacter();
+                        }
+                        case TEXT -> {
+                            newline = false;
+                            if (isHtmlFile) {
+                                switch (phase) {
+                                    case PREAMBLE -> {
+                                        if (isEndPreamble()) {
+                                            trees.add(html());
+                                            if (textStart == -1) {
+                                                textStart = bp;
+                                                lastNonWhite = -1;
+                                            }
+                                            // mark this as the start, for processing purposes
+                                            newline = true;
+                                            break loop;
+                                        }
                                     }
-                                    // mark this as the start, for processing purposes
-                                    newline = true;
-                                    break loop;
-                                }
-                            }
-                            case BODY -> {
-                                if (isEndBody()) {
-                                    addPendingText(trees, lastNonWhite);
-                                    break loop;
+                                    case BODY -> {
+                                        if (isEndBody()) {
+                                            addPendingText(trees, lastNonWhite);
+                                            break loop;
+                                        }
+                                    }
+                                    default -> { }
                                 }
                             }
+                            addPendingText(trees, bp - 1);
+                            trees.add(html());
 
-                            default -> { }
+                            if (phase == Phase.PREAMBLE || phase == Phase.POSTAMBLE) {
+                                break; // Ignore newlines after html tags, in the meta content
+                            }
+                            if (textStart == -1) {
+                                textStart = bp;
+                                lastNonWhite = -1;
+                            }
                         }
+                        default -> throw unknownTextKind(textKind);
                     }
-                    addPendingText(trees, bp - 1);
-                    trees.add(html());
+                }
 
-                    if (phase == Phase.PREAMBLE || phase == Phase.POSTAMBLE) {
-                        break; // Ignore newlines after html tags, in the meta content
-                    }
-                    if (textStart == -1) {
-                        textStart = bp;
-                        lastNonWhite = -1;
+                case '{' -> {
+                    switch (phase) {
+                        case PREAMBLE, POSTAMBLE -> defaultContentCharacter();
+                        case BODY -> inlineTag(trees);
+                        case INLINE -> {
+                            if (!inlineTag(trees)) {
+                                depth++;
+                            }
+                        }
                     }
-                    break;
+                }
 
-                case '{':
-                    inlineTag(trees);
-                    break;
+                case '}' -> {
+                    if (phase == Phase.INLINE) {
+                        newline = false;
+                        if (--depth == 0) {
+                            addPendingText(trees, bp - 1);
+                            nextChar();
+                            return trees.toList();
+                        }
+                        nextChar();
+                    } else {
+                        defaultContentCharacter();
+                    }
+                }
 
-                case '@':
+                case '@' -> {
                     // check for context-sensitive escape sequences:
                     //   newline whitespace @@
                     //   newline whitespace @*
@@ -236,7 +401,7 @@ protected List<DCTree> blockContent(Phase phase) {
                             nextChar();
                             textStart = bp;
                             break;
-                        } else {
+                        } else if (phase == Phase.BODY) {
                             addPendingText(trees, lastNonWhite);
                             break loop;
                         }
@@ -249,21 +414,82 @@ protected List<DCTree> blockContent(Phase phase) {
                         textStart = bp;
                         break;
                     }
-                    // fallthrough
+                    defaultContentCharacter();
+                }
 
-                default:
-                    newline = false;
-                    if (textStart == -1)
-                        textStart = bp;
-                    lastNonWhite = bp;
-                    nextChar();
+                case '\\' -> {
+                    switch (textKind) {
+                        case MARKDOWN -> {
+                            defaultContentCharacter();
+                            nextChar();
+                            defaultContentCharacter();
+                        }
+                        case TEXT -> {
+                            defaultContentCharacter();
+                        }
+                    }
+                }
+
+                case '`', '~' -> {
+                    switch (textKind) {
+                        case MARKDOWN -> {
+                            newline = false;
+                            if (textStart == -1) {
+                                textStart = bp;
+                            }
+                            lastNonWhite = bp;
+                            var saveNewline = newline;
+                            var isCodeFence = markdown.isCodeFence();
+                            if (ch == '`' || ch == '~' && isCodeFence) {
+                                int end = markdown.skipCode();
+                                if (end == -1) {
+                                    // if a match for the opening sequence of characters was not found:
+                                    // - if the characters were a fence, the code block extends to the end of file
+                                    // - if the characters were inline, the opening characters are treated literally
+                                    if (isCodeFence) {
+                                        lastNonWhite = buflen - 1;
+                                    } else {
+                                        bp = lastNonWhite;
+                                        newline = saveNewline;
+                                        nextChar();
+                                    }
+                                } else {
+                                    lastNonWhite = end - 1;
+                                }
+                            } else {
+                                nextChar();
+                            }
+                        }
+                        case TEXT -> {
+                            defaultContentCharacter();
+                        }
+                    }
+                }
+
+                default -> {
+                    defaultContentCharacter();
+                }
             }
         }
 
         if (lastNonWhite != -1)
             addPendingText(trees, lastNonWhite);
 
-        return trees.toList();
+        return (phase == Phase.INLINE)
+                ? List.of(erroneous("dc.unterminated.inline.tag", pos))
+                : trees.toList();
+    }
+
+    void defaultContentCharacter() {
+        newline = false;
+        if (textStart == -1)
+            textStart = bp;
+        lastNonWhite = bp;
+        nextChar();
+    }
+
+    private IllegalStateException unknownTextKind(DocTree.Kind textKind) {
+        return new IllegalStateException(textKind.toString());
     }
 
     /**
@@ -312,7 +538,40 @@ protected DCTree blockTag() {
         }
     }
 
-    protected void inlineTag(ListBuffer<DCTree> list) {
+    // unused, but useful when debugging
+    private String showPos(int p) {
+        var sb = new StringBuilder();
+        sb.append("[").append(p).append("] ");
+        if (p >= 0) {
+            for (int i = Math.max(p - 10, 0); i < Math.min(p + 10, buflen); i++) {
+                if (i == p) sb.append("[");
+                var c = buf[i];
+                sb.append(switch (c) {
+                    case '\n' -> '|';
+                    case ' ' -> '_';
+                    default -> c;
+                });
+                if (i == p) sb.append("]");
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Reads a possible inline tag, after finding an opening brace <code>{</code> character.
+     *
+     * If the next character is {@code @}, an opening tag is read and added to the
+     * given {@code list}, and the result is {@code true}.
+     *
+     * Otherwise, the {@code list} is updated with the characters that have been read,
+     * and the result is {@code false}. The result also indicates that a single
+     * opening brace was read, and that a corresponding closing brace should eventually
+     * be read.
+     *
+     * @param list the list of trees being accumulated
+     * @return {@code true} if an inline tag was read, and {@code false} otherwise
+     */
+    protected boolean inlineTag(ListBuffer<DCTree> list) {
         newline = false;
         nextChar();
         if (ch == '@') {
@@ -333,12 +592,14 @@ protected void inlineTag(ListBuffer<DCTree> list) {
                 list.add(inlineTag());
                 textStart = bp;
                 lastNonWhite = -1;
+                return true;
             }
         } else {
             if (textStart == -1)
                 textStart = bp - 1;
             lastNonWhite = bp;
         }
+        return false;
     }
 
     /**
@@ -586,97 +847,9 @@ protected DCText inlineWord() {
      * Matching pairs of '{' '}' are skipped; the text is terminated by the first
      * unmatched '}'. It is an error if the beginning of the next tag is detected.
      */
-    @SuppressWarnings("fallthrough")
     private List<DCTree> inlineContent() {
-        ListBuffer<DCTree> trees = new ListBuffer<>();
-
         skipWhitespace();
-        int pos = bp;
-        int depth = 1;
-        textStart = -1;
-
-        loop:
-        while (bp < buflen) {
-
-            switch (ch) {
-                case '\n': case '\r': case '\f':
-                case ' ': case '\t':
-                    nextChar();
-                    break;
-
-                case '&':
-                    entity(trees);
-                    break;
-
-                case '<':
-                    newline = false;
-                    addPendingText(trees, bp - 1);
-                    trees.add(html());
-                    textStart = bp;
-                    lastNonWhite = -1;
-                    break;
-
-                case '{':
-                    if (textStart == -1)
-                        textStart = bp;
-                    newline = false;
-                    nextChar();
-                    if (ch == '@') {
-                        addPendingText(trees, bp - 2);
-                        trees.add(inlineTag());
-                        textStart = bp;
-                        lastNonWhite = -1;
-                    } else {
-                        depth++;
-                    }
-                    break;
-
-                case '}':
-                    newline = false;
-                    if (--depth == 0) {
-                        addPendingText(trees, bp - 1);
-                        nextChar();
-                        return trees.toList();
-                    }
-                    nextChar();
-                    break;
-
-                case '@':
-                    // check for context-sensitive escape sequences:
-                    //   newline whitespace @@
-                    //   newline whitespace @*
-                    //   *@/
-                    if (newline) {
-                        char peek = peekChar();
-                        if (peek == '@' || peek == '*') {
-                            addPendingText(trees, bp - 1);
-                            nextChar();
-                            trees.add(m.at(bp - 1).newEscapeTree(ch));
-                            newline = false;
-                            nextChar();
-                            textStart = bp;
-                            break;
-                        }
-                    } else if (textStart != -1 && buf[bp - 1] == '*' && peekChar() == '/') {
-                        addPendingText(trees, bp - 1);
-                        nextChar();
-                        trees.add(m.at(bp - 1).newEscapeTree('/'));
-                        newline = false;
-                        nextChar();
-                        textStart = bp;
-                        break;
-                    }
-                    // fallthrough
-
-                default:
-                    if (textStart == -1)
-                        textStart = bp;
-                    nextChar();
-                    break;
-            }
-        }
-
-        return List.of(erroneous("dc.unterminated.inline.tag", pos));
+        return content(Phase.INLINE);
     }
 
     protected void entity(ListBuffer<DCTree> list) {
@@ -845,8 +1018,15 @@ boolean peek(String s) {
     }
 
     /**
-     * Read the start or end of an HTML tag, or an HTML comment
-     * {@literal <identifier attrs> } or {@literal </identifier> }
+     * Reads an HTML construct, beginning with {@code <}.
+     *
+     * <ul>
+     * <li>start element: {@code <identifier attrs> }
+     * <li>end element: {@code </identifier> }
+     * <li>comment: {@code <!-- ... -->}
+     * <li>doctype: {@code <!doctype ... >}
+     * <li>cdata: {@code <![CDATA[ ... ]]>}
+     * </ul>
      */
     private DCTree html() {
         int p = bp;
@@ -983,7 +1163,7 @@ protected List<DCTree> htmlAttrs() {
                         }
                         attrValueChar(v);
                     }
-                    addPendingText(v, bp - 1);
+                    addPendingText(v, bp - 1, DocTree.Kind.TEXT);
                     nextChar();
                 } else {
                     vkind = ValueKind.UNQUOTED;
@@ -991,7 +1171,7 @@ protected List<DCTree> htmlAttrs() {
                     while (bp < buflen && !isUnquotedAttrValueTerminator(ch)) {
                         attrValueChar(v);
                     }
-                    addPendingText(v, bp - 1);
+                    addPendingText(v, bp - 1, DocTree.Kind.TEXT);
                 }
                 skipWhitespace();
                 value = v.toList();
@@ -1012,9 +1192,20 @@ protected void attrValueChar(ListBuffer<DCTree> list) {
     }
 
     protected void addPendingText(ListBuffer<DCTree> list, int textEnd) {
+        addPendingText(list, textEnd, textKind);
+    }
+
+    protected void addPendingText(ListBuffer<DCTree> list, int textEnd, DocTree.Kind kind) {
         if (textStart != -1) {
             if (textStart <= textEnd) {
-                list.add(m.at(textStart).newTextTree(newString(textStart, textEnd + 1)));
+                switch (kind) {
+                    case TEXT ->
+                            list.add(m.at(textStart).newTextTree(newString(textStart, textEnd + 1)));
+                    case MARKDOWN ->
+                            list.add(m.at(textStart).newRawTextTree(DocTree.Kind.MARKDOWN, newString(textStart, textEnd + 1)));
+                    default ->
+                        throw new IllegalArgumentException(kind.toString());
+                }
             }
             textStart = -1;
         }
@@ -1124,6 +1315,456 @@ protected Name readSystemPropertyName() {
         return names.fromChars(buf, pos, bp - pos);
     }
 
+    /**
+     * A class to encapsulate the work to parse Markdown enough to
+     * detect the boundaries of character sequences of literal text,
+     * and to skip over such sequences, without analyzing the content.
+     *
+     * The primary factors are:
+     *   - the content of the current line, including its indentation
+     *   - the currently open set of container blocks, and any leaf block
+     *   - a serial number that is incremented when a line is encountered
+     *     that is not a continuation of the previous block.
+     *
+     * There are some limitations when using code blocks containing
+     * strings that resemble tags, which should be treated as literal text.
+     * In particular, list items are parsed individually and not as
+     * part of an overall group of list items. This means that the
+     * indentation is determined _for each item_, and not for the group
+     * as a whole. This in turn implies that a list item cannot begin
+     * with an indented code block. The workaround is to use a fenced code
+     * block. It is also recommended, as a matter of style, that all
+     * list items should use the same relative indentation for their content.
+     *
+     * The restrictions only apply when indented code blocks contain
+     * strings resembling tags.
+     *
+     * @see <a href="https://spec.commonmark.org/0.30/">CommonMark spec</a>
+     */
+    class Markdown {
+        // Container blocks may nested contained blocks and leaf blocks.
+        // Note, the code does not model lists, which would require
+        // arbitrary multi-line lookahead.
+        // https://spec.commonmark.org/0.30/#container-blocks
+        private enum ContainerBlockKind {
+            LIST_ITEM, QUOTE
+        }
+
+        /**
+         * Details about a currently open container block.
+         * @param blockKind the kind of block
+         * @param indent the indentation for the block's content, for list items
+         */
+        private record BlockInfo(ContainerBlockKind blockKind, int indent) { }
+
+        /**
+         * A list of the currently open container blocks.
+         */
+        private final java.util.List<BlockInfo> containers = new ArrayList<>();
+
+
+        // Except for NONE, leaf blocks contain "textual" content.
+        // Single-line leaf blocks, like ATX headings and thematic breaks are all represented by NONE.
+        // See https://spec.commonmark.org/0.30/#leaf-blocks
+        private enum LeafBlockKind {
+            NONE, PARAGRAPH, FENCED_CODE, INDENTED_CODE
+        }
+
+        private LeafBlockKind leafKind = LeafBlockKind.NONE;
+
+        /**
+         * A serial number for the current "block".
+         * It is updated whenever a line is encountered that indicates
+         * the beginning of a new block, such that any potential code span
+         * should be terminated as "not a span".
+         */
+        private int blockId = 0;
+
+        /**
+         * Updates the state after a newline has been read.
+         * There are two primary goals.
+         *
+         * 1. Determine any change to the current list of container blocks
+         * 2. Determine if the current line is part of a code block
+         */
+        void update() {
+            var prevLeafKind = leafKind;
+            int indent = readIndent(0);
+
+            final var line = peekLine();
+            var peekIndex = 0;  // index into `line`; note it does not include `indent`
+            var blockIndex = 0; // index into `blocks`
+
+            // Iterate examining the beginning of the line, left to right,
+            // comparing indications of containers (indentation or markers)
+            // against the list of currently open container blocks.
+            // Side effects may open nested blocks or close existing ones.
+            while (true) {
+                if (blockIndex == containers.size()) {
+                    // check for an open code block
+                    if (prevLeafKind == LeafBlockKind.FENCED_CODE) {
+                        return;
+                    } else {
+                        var codeIndent = (containers.isEmpty() ? 0 : containers.getLast().indent) + 4;
+                        if (indent >= codeIndent && prevLeafKind != LeafBlockKind.PARAGRAPH) {
+                            leafKind = LeafBlockKind.INDENTED_CODE;
+                            if (leafKind != prevLeafKind) {
+                                blockId++;
+                            }
+                            return;
+                        }
+                    }
+                    // examine the remaining part of the lne
+                    var peekLineKind = getLineKind(line.substring(peekIndex));
+                    switch (peekLineKind) {
+                        case BULLETED_LIST_ITEM, ORDERED_LIST_ITEM -> {
+                            var count = indent;
+                            // skip over the list marker
+                            while (ch != ' ' && ch != '\t') {
+                                count++;
+                                nextChar();
+                            }
+                            var listItemIndent = readIndent(count);
+                            containers.add(new BlockInfo(ContainerBlockKind.LIST_ITEM, listItemIndent));
+                            blockIndex++;
+                            peekIndex = listItemIndent - indent;
+                            blockId++;
+                        }
+
+                        case BLOCK_QUOTE -> {
+                            containers.add(new BlockInfo(ContainerBlockKind.QUOTE,  indent + 1));
+                            blockIndex++;
+                            peekIndex += 1;
+                            blockId++;
+                        }
+
+                        case OTHER -> {
+                            leafKind = LeafBlockKind.PARAGRAPH;
+                            return;
+                        }
+
+                        case ATX_HEADER, SETEXT_UNDERLINE, THEMATIC_BREAK, BLANK -> {
+                            leafKind = LeafBlockKind.NONE;
+                            blockId++;
+                            return;
+                        }
+
+                        case CODE_FENCE -> {
+                            leafKind = LeafBlockKind.FENCED_CODE;
+                            blockId++;
+                            return;
+                        }
+                    }
+                } else {
+                    var block = containers.get(blockIndex);
+                    var blockKind = block.blockKind;
+                    switch (blockKind) {
+                        case LIST_ITEM -> {
+                            if (indent >= block.indent) {
+                                blockIndex++;
+                            } else {
+                                var peekLineKind = getLineKind(line.substring(peekIndex));
+                                if (peekLineKind == LineKind.BLANK) {
+                                    // blank lines are considered to be part of a list item
+                                    blockIndex++;
+                                } else if (peekLineKind == LineKind.OTHER && prevLeafKind == LeafBlockKind.PARAGRAPH) {
+                                    // lazy continuation line: leaf kind and id are unchanged
+                                    return;
+                                } else {
+                                    closeContainer(blockIndex);
+                                    blockId++;
+                                }
+                            }
+                        }
+
+                        case QUOTE -> {
+                            var peekLineKind = getLineKind(line.substring(peekIndex));
+                            if (peekLineKind == LineKind.BLOCK_QUOTE) {
+                                blockIndex++;
+                                peekIndex++;
+                            } else if (peekLineKind == LineKind.OTHER && prevLeafKind == LeafBlockKind.PARAGRAPH) {
+                                // lazy continuation line: leaf kind and id are unchanged
+                                return;
+                            } else {
+                                closeContainer(blockIndex);
+                                blockId++;
+                            }
+                        }
+
+                        default -> throw new IllegalStateException(blockKind.toString());
+                    }
+                }
+            }
+        }
+
+        /**
+         * {@return {@code true} if the current line is part of an indented code block,
+         *          and {@code false} otherwise}
+         * Indented code blocks should be treated as literal text and not scanned for tags.
+         */
+        boolean isIndentedCodeBlock() {
+            return leafKind == LeafBlockKind.INDENTED_CODE;
+        }
+
+        /**
+         * {@return {@code true} if the current line is part of a fenced code block,
+         *          and {@code false} otherwise}
+         * Code fences are used to surround content that should be treated as literal text
+         * and not scanned for tags.
+         */
+        boolean isCodeFence() {
+            return leafKind == LeafBlockKind.FENCED_CODE;
+        }
+
+        /**
+         * Closes a given container block, and any open nested blocks.
+         *
+         * @param index the index of the block to be closed
+         */
+        private void closeContainer(int index) {
+            containers.subList(index, containers.size()).clear();
+        }
+
+        /**
+         * Skips the content of the current line.
+         */
+        void skipLine() {
+            while (bp < buflen) {
+                if (ch == '\n' || ch == '\r') {
+                    return;
+                }
+                nextChar();
+            }
+        }
+
+        /**
+         * Skips literal content.
+         *
+         * The ending delimiter is a function of the repetition count of the current
+         * character, and whether this is fenced content or not.
+         *
+         * In fenced content, the ending delimiter must appear at the start of a line;
+         * the code block may also be terminated implicitly by the end of a containing block.
+         *
+         * In other content, the scan may be terminated if the blockId changes,
+         * meaning the ending delimiter was not found before the block ended.
+         *
+         * @return the current position, or {@code -1} to indicate that the ending
+         *         delimiter was not found
+         */
+        int skipCode() {
+            char term = ch;
+            var count = count(term);
+            var initialLeafKind = leafKind;
+            var isFenced = (leafKind == LeafBlockKind.FENCED_CODE);
+            var initialBlockId = blockId;
+            while (bp < buflen) {
+                switch (ch) {
+                    case '\n', '\r' -> {
+                        nextChar();
+                        update();
+                        if (isFenced) {
+                            if (leafKind == LeafBlockKind.FENCED_CODE && ch == term && count(ch) >= count
+                                    || blockId != initialBlockId) {
+                                leafKind = LeafBlockKind.NONE;
+                                return bp;
+                            }
+                        } else {
+                            if (blockId != initialBlockId) {
+                                return -1;
+                            }
+                        }
+                    }
+
+                    default -> {
+                        if (ch == term && initialLeafKind != LeafBlockKind.FENCED_CODE ) {
+                            if (count(ch) == count) {
+                                return bp;
+                            }
+                        }
+                        nextChar();
+                    }
+                }
+            }
+            // found end of input
+            return -1;
+        }
+
+        /**
+         * Reads spaces and tabs, expanding tabs as if they were replaced by spaces
+         * with a tab stop of 4 characters.
+         *
+         * @param initialCount the initial indentation
+         * @return the indentation after skipping spaces and tabs
+         */
+        private int readIndent(int initialCount) {
+            final int TABSTOP = 4;
+            int indent = initialCount;
+            while (bp < buflen) {
+                switch (ch) {
+                    case ' ' -> indent++;
+                    case '\t' -> indent += TABSTOP - indent % TABSTOP;
+                    default -> {
+                        return indent;
+                    }
+                }
+                nextChar();
+            }
+            return indent;
+        }
+
+        /**
+         * Matches a string against an ordered series of regular expressions,
+         * to determine the "kind" of the string.
+         *
+         * @return the "kind" of the line
+         */
+        private LineKind getLineKind(String s) {
+            if (s.isBlank()) {
+                return LineKind.BLANK;
+            }
+
+            switch (s.charAt(0)) {
+                case '#', '=', '-', '+', '*', '_', '`', '~', '>',
+                        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' -> {
+                    for (LineKind lk : LineKind.values()) {
+                        if (lk.pattern.matcher(s).matches()) {
+                            return lk;
+                        }
+                    }
+                }
+            }
+
+            return LineKind.OTHER;
+        }
+
+        /**
+         * {@return a string obtained by peeking ahead at the current line}
+         * The current position is unchanged.
+         */
+        private String peekLine() {
+            int p = bp;
+            while (p < buflen) {
+                switch (buf[p]) {
+                    case '\n', '\r' -> {
+                        return newString(bp, p);
+                    }
+                    default -> p++;
+                }
+            }
+            return newString(bp, buflen);
+        }
+
+        /**
+         * {@return the number of consecutive occurrences of the given character}
+         *
+         * @param c the character
+         */
+        private int count(char c) {
+            int n = 1;
+            nextChar();
+            while (bp < buflen && ch == c) {
+                n++;
+                nextChar();
+            }
+            return n;
+        }
+
+        // unused, but useful when debugging
+        @Override
+        public String toString() {
+            return getClass().getSimpleName()
+                    + "[containers:" + containers
+                    + ", leafKind:" + leafKind
+                    + ", blockId:" + blockId
+                    + "]";
+        }
+    }
+
+    /**
+     * The kinds of line, used when reading a Markdown documentation comment.
+     * The values are loosely ordered by a combination of the specificity of
+     * the associated pattern, and the likelihood of use in a doc comment.
+     *
+     * Note that some of the patterns overlap, such as SETEXT_UNDERLINE and
+     * THEMATIC_BREAK. The CommonMark spec resolves the ambiguities with
+     * priority rules, such as the following:
+     *
+     * * If a line of dashes that meets the above conditions for being a
+     *   thematic break could also be interpreted as the underline of a
+     *   setext heading, the interpretation as a setext heading takes precedence.
+     *
+     * * When both a thematic break and a list item are possible interpretations
+     *   of a line, the thematic break takes precedence.
+     *
+     * Here in this context, the primary purpose of these kinds is to help
+     * determine when a block boundary terminates literal text, such as a
+     * code span, and so the exact nature of the line kind does not matter.
+     */
+    // This class is only used within the Markdown class, and could be
+    // a private nested class there.
+    enum LineKind {
+        BLANK(Pattern.compile("[ \t]*")),
+
+        /**
+         * ATX header: starts with 1 to 6 # characters, followed by space or tab or end of line.
+         * @see <a href="https://spec.commonmark.org/0.30/#atx-headings">ATX Headings</a>
+         */
+        ATX_HEADER(Pattern.compile("#{1,6}([ \t].*|$)")),
+
+        /**
+         * Setext header: underline is sequence of = or - followed by optional spaces and tabs.
+         * @see <a href="https://spec.commonmark.org/0.30/#setext-headings">Setext Headings</a>
+         */
+        SETEXT_UNDERLINE(Pattern.compile("(=+|-+)[ \t]*")),
+
+        /**
+         * Thematic break: a line of * - _ interspersed with optional spaces and tabs
+         * @see <a href="https://spec.commonmark.org/0.30/#thematic-breaks">Thematic Break</a>
+         */
+        THEMATIC_BREAK(Pattern.compile("((\\*[ \t]*+){3,})|((-[ \t]*+){3,})|((_[ \t]*+){3,})")),
+
+        /**
+         * Code fence: 3 or more back ticks or tildes; back tick fence cannot have back ticks
+         * in the info string.
+         * Note potential conflict with strikeout for similar reasons if strikeout is supported.
+         * @see <a href="https://spec.commonmark.org/0.30/#code-fence">Code Fence</a>
+         */
+        CODE_FENCE(Pattern.compile("(`{3,}[^`]*+)|(~{3,}.*+)")),
+
+        /**
+         * Bullet list item: * + - followed by at least one space or tab
+         * @see <a href="https://spec.commonmark.org/0.30/#list-items">List items</a>
+         */
+        BULLETED_LIST_ITEM(Pattern.compile("[-+*][ \t].*")),
+
+        /**
+         * Ordered list item: a sequence of 1-9 arabic digits (0-9), followed by
+         * either a . character or a ), followed by at least one space or tab
+         * @see <a href="https://spec.commonmark.org/0.30/#list-items">List items</a>
+         */
+        ORDERED_LIST_ITEM(Pattern.compile("[0-9]{1,9}[.)][ \t].*")),
+
+        /**
+         * Block quote: >
+         * @see <a href="https://spec.commonmark.org/0.30/#block-quotes">Block quotes</a>
+         */
+        BLOCK_QUOTE(Pattern.compile(">.*")),
+
+        /**
+         * Everything else...
+         *
+         * This entry must come last, since it matches "none of the above".
+         */
+        OTHER(Pattern.compile(".*"));
+
+        LineKind(Pattern p) {
+            this.pattern = p;
+        }
+
+        final Pattern pattern;
+    }
+
     protected boolean isDecimalDigit(char ch) {
         return ('0' <= ch && ch <= '9');
     }
@@ -1559,7 +2200,7 @@ private List<DCTree> tagAttrs() {
                                 while (bp < buflen && ch != quote) {
                                     nextChar();
                                 }
-                                addPendingText(v, bp - 1);
+                                addPendingText(v, bp - 1, DocTree.Kind.TEXT);
                                 nextChar();
                             } else {
                                 vkind = ValueKind.UNQUOTED;
@@ -1568,7 +2209,7 @@ private List<DCTree> tagAttrs() {
                                 while (bp < buflen && (ch != '}' && ch != ':' && !isUnquotedAttrValueTerminator(ch))) {
                                     nextChar();
                                 }
-                                addPendingText(v, bp - 1);
+                                addPendingText(v, bp - 1, DocTree.Kind.TEXT);
                             }
                             skipWhitespace();
                             value = v.toList();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
index 403cb30921a..a38658a315e 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
@@ -76,6 +76,11 @@ public class JavaTokenizer extends UnicodeReader {
      */
     private final Preview preview;
 
+    /**
+     * Whether "///" comments are recognized as documentation comments.
+     */
+    protected final boolean enableLineDocComments;
+
     /**
      * The log to be used for error reporting. Copied from scanner factory.
      */
@@ -163,6 +168,7 @@ protected JavaTokenizer(ScannerFactory fac, char[] array, int length) {
         this.tokens = fac.tokens;
         this.source = fac.source;
         this.preview = fac.preview;
+        this.enableLineDocComments = fac.enableLineDocComments;
         this.lint = fac.lint;
         this.sb = new StringBuilder(256);
     }
@@ -918,10 +924,22 @@ public Token readToken() {
                     next();
 
                     if (accept('/')) { // (Spec. 3.7)
-                        skipToEOLN();
+                        if (enableLineDocComments && accept('/')) { // JavaDoc line comment
+                            int endPos;
+                            do {
+                                skipToEOLN();
+                                endPos = position();
+                                skipLineTerminator();
+                                skipWhitespace();
+                             } while (accept("///"));
+
+                            comments = appendComment(comments, processComment(pos, endPos, CommentStyle.JAVADOC_LINE));
+                        } else {
+                            skipToEOLN();
 
-                        if (isAvailable()) {
-                            comments = appendComment(comments, processComment(pos, position(), CommentStyle.LINE));
+                            if (isAvailable()) {
+                                comments = appendComment(comments, processComment(pos, position(), CommentStyle.LINE));
+                            }
                         }
                         break;
                     } else if (accept('*')) { // (Spec. 3.7)
@@ -929,7 +947,7 @@ public Token readToken() {
                         CommentStyle style;
 
                         if (accept('*')) {
-                            style = CommentStyle.JAVADOC;
+                            style = CommentStyle.JAVADOC_BLOCK;
 
                             if (is('/')) {
                                 isEmpty = true;
@@ -1207,7 +1225,7 @@ protected static class BasicComment extends PositionTrackingReader implements Co
         /**
          * Style of comment
          */
-        CommentStyle cs;
+        final CommentStyle cs;
 
         DiagnosticPosition pos;
 
@@ -1312,7 +1330,7 @@ UnicodeReader trimEndOfComment(UnicodeReader line) {
         }
 
         /**
-         * Trim the first part of the JavaDoc comment.
+         * Trim the first part of the JavaDoc block comment.
          *
          * @param line line reader
          *
@@ -1334,6 +1352,49 @@ UnicodeReader trimJavadocComment(UnicodeReader line) {
             return line;
         }
 
+        /**
+         * Determine how much indent to remove from a JavaDoc line comment.
+         *
+         * @return minimum indent to remove
+         */
+        int getJavadocLineCommentIndent() {
+            int result = Integer.MAX_VALUE;
+            UnicodeReader fullReader = lineReader(position(), position() + length());
+
+            while (fullReader.isAvailable()) {
+                UnicodeReader line = fullReader.lineReader();
+                line.skipWhitespace();
+                line.accept("///");
+                int pos = line.position();
+                line.skipWhitespace();
+
+                if (line.isAvailable()) {
+                    result = Integer.min(result, line.position() - pos);
+                }
+            }
+
+            return result == Integer.MAX_VALUE ? 0 : result;
+        }
+
+        /**
+         * Trim the first part of a JavaDoc line comment.
+         *
+         * @param indent how much indentation to remove
+         * @param line line reader
+         *
+         * @return modified line reader
+         */
+        UnicodeReader trimJavadocLineComment(UnicodeReader line, int indent) {
+            line.skipWhitespace();
+            line.accept("///");
+
+            for (int i = 0; line.isAvailable() && i < indent; i++) {
+                line.next();
+            }
+
+            return line;
+        }
+
         /**
          * Put the line into the buffer.
          *
@@ -1350,39 +1411,52 @@ protected void scanDocComment() {
             if (!scanned) {
                 deprecatedFlag = false;
                 scanned = true;
+                CommentStyle style;
+                int indent = 0;
+                int start = position();
+
+                if (accept("/**")) {
+                    style = CommentStyle.JAVADOC_BLOCK;
+                    if (skip('*') != 0 && is('/')) {
+                        return ;
+                    }
 
-                if (!accept("/**")) {
-                    return;
-                }
-
-                if (skip('*') != 0 && is('/')) {
-                    return ;
-                }
-
-                skipWhitespace();
+                    skipWhitespace();
 
-                if (isEOLN()) {
-                    accept('\r');
-                    accept('\n');
+                    if (isEOLN()) {
+                        accept('\r');
+                        accept('\n');
+                    }
+                } else if (accept("///")) {
+                    style = CommentStyle.JAVADOC_LINE;
+                    reset(start);
+                    indent = getJavadocLineCommentIndent();
+                } else {
+                    return;
                 }
 
                 while (isAvailable()) {
                     UnicodeReader line = lineReader();
-                    line = trimJavadocComment(line);
-
-                    // If standalone @deprecated tag
-                    int pos = line.position();
-                    line.skipWhitespace();
-
-                    if (line.accept("@deprecated") &&
-                            (!line.isAvailable() ||
-                                    line.isWhitespace() ||
-                                    line.isEOLN() ||
-                                    line.get() == EOI)) {
-                        deprecatedFlag = true;
+                    line = (style == CommentStyle.JAVADOC_LINE)
+                            ? trimJavadocLineComment(line, indent)
+                            : trimJavadocComment(line);
+
+                    if (cs == CommentStyle.JAVADOC_BLOCK) {
+                        // If standalone @deprecated tag
+                        int pos = line.position();
+                        line.skipWhitespace();
+
+                        if (line.accept("@deprecated") &&
+                                (!line.isAvailable() ||
+                                        line.isWhitespace() ||
+                                        line.isEOLN() ||
+                                        line.get() == EOI)) {
+                            deprecatedFlag = true;
+                        }
+
+                        line.reset(pos);
                     }
 
-                    line.reset(pos);
                     putLine(line);
                 }
             }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/LazyDocCommentTable.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/LazyDocCommentTable.java
index 23966c7bd9a..7fcd46d38a5 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/LazyDocCommentTable.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/LazyDocCommentTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.lang.model.util.Elements.DocCommentKind;
+
+import com.sun.source.doctree.DocCommentTree;
+
 import com.sun.tools.javac.parser.Tokens.Comment;
-import com.sun.tools.javac.tree.DCTree.DCDocComment;
 import com.sun.tools.javac.tree.DocCommentTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.util.DiagnosticSource;
@@ -44,7 +47,7 @@
 public class LazyDocCommentTable implements DocCommentTable {
     private static class Entry {
         final Comment comment;
-        DCDocComment tree;
+        DocCommentTree tree;
 
         Entry(Comment c) {
             comment = c;
@@ -72,6 +75,16 @@ public Comment getComment(JCTree tree) {
         return (e == null) ? null : e.comment;
     }
 
+    @Override
+    public DocCommentKind getCommentKind(JCTree tree) {
+        Comment c = getComment(tree);
+        return (c == null) ? null : switch (c.getStyle()) {
+            case JAVADOC_BLOCK -> DocCommentKind.TRADITIONAL;
+            case JAVADOC_LINE -> DocCommentKind.END_OF_LINE;
+            default -> throw new IllegalStateException(c.getStyle().toString());
+        };
+    }
+
     @Override
     public String getCommentText(JCTree tree) {
         Comment c = getComment(tree);
@@ -79,12 +92,14 @@ public String getCommentText(JCTree tree) {
     }
 
     @Override
-    public DCDocComment getCommentTree(JCTree tree) {
+    public DocCommentTree getCommentTree(JCTree tree) {
         Entry e = table.get(tree);
-        if (e == null)
+        if (e == null) {
             return null;
-        if (e.tree == null)
-            e.tree = new DocCommentParser(fac, diagSource, e.comment).parse();
+        }
+        if (e.tree == null) {
+            e.tree = fac.getTrees().getDocCommentTree(diagSource, e.comment);
+        }
         return e.tree;
     }
 
@@ -92,5 +107,4 @@ public DCDocComment getCommentTree(JCTree tree) {
     public void putComment(JCTree tree, Comment c) {
         table.put(tree, new Entry(c));
     }
-
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java
index 3c07c382aa3..c873c6f31b7 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java
@@ -27,6 +27,7 @@
 
 import java.util.Locale;
 
+import com.sun.tools.javac.api.JavacTrees;
 import com.sun.tools.javac.code.DeferredLintHandler;
 import com.sun.tools.javac.code.Lint;
 import com.sun.tools.javac.code.Preview;
@@ -34,7 +35,6 @@
 import com.sun.tools.javac.tree.DocTreeMaker;
 import com.sun.tools.javac.tree.TreeMaker;
 import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.JCDiagnostic;
 import com.sun.tools.javac.util.Log;
 import com.sun.tools.javac.util.Names;
 import com.sun.tools.javac.util.Options;
@@ -72,6 +72,8 @@ public static ParserFactory instance(Context context) {
     final Locale locale;
     final DeferredLintHandler deferredLintHandler;
 
+    private final JavacTrees trees;
+
     @SuppressWarnings("this-escape")
     protected ParserFactory(Context context) {
         super();
@@ -87,6 +89,7 @@ protected ParserFactory(Context context) {
         this.scannerFactory = ScannerFactory.instance(context);
         this.locale = context.get(Locale.class);
         this.deferredLintHandler = DeferredLintHandler.instance(context);
+        this.trees = JavacTrees.instance(context);
     }
 
     public JavacParser newParser(CharSequence input, boolean keepDocComments, boolean keepEndPos, boolean keepLineMap) {
@@ -97,4 +100,8 @@ public JavacParser newParser(CharSequence input, boolean keepDocComments, boolea
         Lexer lexer = scannerFactory.newScanner(input, keepDocComments);
         return new JavacParser(this, lexer, keepDocComments, keepLineMap, keepEndPos, parseModuleInfo);
     }
+
+    public JavacTrees getTrees() {
+        return trees;
+    }
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java
index a182c74b07b..a24e73a4141 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java
@@ -125,7 +125,7 @@ public void nextToken() {
             if (token.comments != null) {
                 for (var c : token.comments) {
                     switch (c.getStyle()) {
-                        case JAVADOC -> {
+                        case JAVADOC_BLOCK, JAVADOC_LINE -> {
                             docComments.add(c);
                         }
                     }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
index 90188eaafea..188fe838b18 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,11 @@
 import com.sun.tools.javac.code.Lint;
 import com.sun.tools.javac.code.Preview;
 import com.sun.tools.javac.code.Source;
+import com.sun.tools.javac.main.Option;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.Log;
 import com.sun.tools.javac.util.Names;
+import com.sun.tools.javac.util.Options;
 
 
 /**
@@ -61,6 +63,7 @@ public static ScannerFactory instance(Context context) {
     final Preview preview;
     final Tokens tokens;
     final Lint lint;
+    final boolean enableLineDocComments;
 
     /** Create a new scanner factory. */
     @SuppressWarnings("this-escape")
@@ -72,6 +75,8 @@ protected ScannerFactory(Context context) {
         this.preview = Preview.instance(context);
         this.tokens = Tokens.instance(context);
         this.lint = Lint.instance(context);
+        var options = Options.instance(context);
+        this.enableLineDocComments = !options.isSet(Option.DISABLE_LINE_DOC_COMMENTS);
     }
 
     public Scanner newScanner(CharSequence input, boolean keepDocComments) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java
index a05d48d320b..963b545b8b3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java
@@ -274,9 +274,10 @@ public boolean test(TokenKind that) {
     public interface Comment {
 
         enum CommentStyle {
-            LINE,       // Starting with //
-            BLOCK,      // starting with /*
-            JAVADOC,    // starting with /**
+            LINE,            // starting with //   -- also known in JLS as "end-of-line comment"
+            BLOCK,           // starting with /*   -- also known in JLS as "traditional comment"
+            JAVADOC_LINE,    // starting with ///
+            JAVADOC_BLOCK    // starting with /**
         }
 
         String getText();
@@ -360,7 +361,7 @@ public int radix() {
          * the last one is returned
          */
         public Comment docComment() {
-            List<Comment> comments = getComments(Comment.CommentStyle.JAVADOC);
+            List<Comment> comments = getDocComments();
             return comments.isEmpty() ?
                     null :
                     comments.head;
@@ -371,7 +372,7 @@ public Comment docComment() {
          * javadoc comment attached to this token contains the '@deprecated' string
          */
         public boolean deprecatedFlag() {
-            for (Comment c : getComments(Comment.CommentStyle.JAVADOC)) {
+            for (Comment c : getDocComments()) {
                 if (c.isDeprecated()) {
                     return true;
                 }
@@ -379,14 +380,15 @@ public boolean deprecatedFlag() {
             return false;
         }
 
-        private List<Comment> getComments(Comment.CommentStyle style) {
+        private List<Comment> getDocComments() {
             if (comments == null) {
                 return List.nil();
             } else {
                 ListBuffer<Comment> buf = new ListBuffer<>();
                 for (Comment c : comments) {
-                    if (c.getStyle() == style) {
-                        buf.add(c);
+                    Comment.CommentStyle style = c.getStyle();
+                    switch (style) {
+                        case JAVADOC_BLOCK, JAVADOC_LINE -> buf.add(c);
                     }
                 }
                 return buf.toList();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
index 0566272ca1b..2b48676e6b8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
@@ -381,6 +381,8 @@ javac.opt.inherit_runtime_environment=\
 javac.opt.default.module.for.created.files=\
     Fallback target module for files created by annotation processors,\n\
     if none specified or inferred.
+javac.opt.lineDocComments=\
+    Disable support for documentation comments with lines beginning '///'
 
 ## messages
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java
index b1f9802354d..a999786f119 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -158,6 +158,11 @@ public int getEndPosition() {
         }
 
         switch (getKind()) {
+            case MARKDOWN -> {
+                DCRawText markdown = (DCRawText) this;
+                return markdown.pos + markdown.code.length();
+            }
+
             case TEXT -> {
                 DCText text = (DCText) this;
                 return text.pos + text.text.length();
@@ -896,6 +901,39 @@ public List<? extends DocTree> getDescription() {
         }
     }
 
+    public static class DCRawText extends DCTree implements RawTextTree {
+        public final Kind kind;
+        public final String code;
+
+        DCRawText(Kind kind, String code) {
+            if (kind != Kind.MARKDOWN) {
+                throw new IllegalArgumentException(String.valueOf(kind));
+            }
+            this.kind = kind;
+            this.code = code;
+        }
+
+        @Override
+        public boolean isBlank() {
+            return code.isBlank();
+        }
+
+        @Override @DefinedBy(Api.COMPILER_TREE)
+        public Kind getKind() {
+            return Kind.MARKDOWN;
+        }
+
+        @Override @DefinedBy(Api.COMPILER_TREE)
+        public <R, D> R accept(DocTreeVisitor<R, D> v, D d) {
+            return v.visitRawText(this, d);
+        }
+
+        @Override @DefinedBy(Api.COMPILER_TREE)
+        public String getContent() {
+            return code;
+        }
+    }
+
     public static class DCReference extends DCEndPosTree<DCReference> implements ReferenceTree {
         public final String signature;
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocCommentTable.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocCommentTable.java
index c5445624d40..9582aa213f9 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocCommentTable.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocCommentTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,12 @@
 
 package com.sun.tools.javac.tree;
 
+import javax.lang.model.util.Elements.DocCommentKind;
+
+import com.sun.source.doctree.DocCommentTree;
 import com.sun.source.doctree.ErroneousTree;
+
 import com.sun.tools.javac.parser.Tokens.Comment;
-import com.sun.tools.javac.tree.DCTree.DCDocComment;
 
 /**
  * A table giving the doc comment, if any, for any tree node.
@@ -39,29 +42,34 @@
  */
 public interface DocCommentTable {
     /**
-     * Check if a tree node has a corresponding doc comment.
+     * Checks if a tree node has a corresponding doc comment.
      */
     boolean hasComment(JCTree tree);
 
     /**
-     * Get the Comment token containing the doc comment, if any, for a tree node.
+     * Returns the Comment token containing the doc comment, if any, for a tree node.
      */
     Comment getComment(JCTree tree);
 
     /**
-     * Get the plain text of the doc comment, if any, for a tree node.
+     * Returns the kind of the doc comment, if any, for a tree node.
+     */
+    DocCommentKind getCommentKind(JCTree tree);
+
+    /**
+     * Returns the plain text of the doc comment, if any, for a tree node.
      */
     String getCommentText(JCTree tree);
 
     /**
-     * Get the parsed form of the doc comment as a DocTree. If any errors
+     * Returns the parsed form of the doc comment as a DocTree. If any errors
      * are detected during parsing, they will be reported via
-     * {@link ErroneousTree ErroneousTree} nodes within the resulting tree.
+     * {@link ErroneousTree} nodes within the resulting tree.
      */
-    DCDocComment getCommentTree(JCTree tree);
+    DocCommentTree getCommentTree(JCTree tree);
 
     /**
-     * Set the Comment to be associated with a tree node.
+     * Sets the Comment to be associated with a tree node.
      */
     void putComment(JCTree tree, Comment c);
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java
index e4f7cf096eb..aac2647db3c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -390,6 +390,16 @@ public Void visitProvides(ProvidesTree node, Void p) {
         return null;
     }
 
+    @Override @DefinedBy(Api.COMPILER_TREE)
+    public Void visitRawText(RawTextTree node, Void p) {
+        try {
+            print(node.getContent());
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+        return null;
+    }
+
     @Override @DefinedBy(Api.COMPILER_TREE)
     public Void visitReference(ReferenceTree node, Void p) {
         try {
@@ -627,8 +637,12 @@ public Void visitUnknownInlineTag(UnknownInlineTagTree node, Void p) {
             print('{');
             print('@');
             print(node.getTagName());
-            print(' ');
-            print(node.getContent());
+            var content = node.getContent();
+            boolean isEmpty = content.stream().allMatch(n -> (n instanceof TextTree t) && t.getBody().isEmpty());
+            if (!isEmpty) {
+                print(' ');
+                print(content);
+            }
             print('}');
         } catch (IOException e) {
             throw new UncheckedIOException(e);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
index c729b6ff832..77f6eefc073 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
@@ -30,6 +30,8 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.lang.model.element.Name;
 import javax.tools.Diagnostic;
@@ -68,6 +70,7 @@
 import com.sun.tools.javac.tree.DCTree.DCParam;
 import com.sun.tools.javac.tree.DCTree.DCProvides;
 import com.sun.tools.javac.tree.DCTree.DCReference;
+import com.sun.tools.javac.tree.DCTree.DCRawText;
 import com.sun.tools.javac.tree.DCTree.DCReturn;
 import com.sun.tools.javac.tree.DCTree.DCSee;
 import com.sun.tools.javac.tree.DCTree.DCSerial;
@@ -211,12 +214,12 @@ public DCDocComment newDocCommentTree(List<? extends DocTree> fullBody,
         lb.addAll(cast(fullBody));
         List<DCTree> fBody = lb.toList();
 
-        // A dummy comment to keep the diagnostics logic happy.
+        // A dummy comment that returns Position.NOPOS for any source position.
+        // A different solution would be to replace the Comment field
+        // in DCDocComment with a narrower type equivalent to Function<int,int>
+        // so that here in this code we can just supply a lambda as follows:
+        //   i -> Position.NOPOS
         Comment c = new Comment() {
-            @Override
-            public String getText() {
-                return null;
-            }
 
             @Override
             public JCDiagnostic.DiagnosticPosition getPos() {
@@ -228,14 +231,19 @@ public int getSourcePos(int index) {
                 return Position.NOPOS;
             }
 
+            @Override
+            public String getText() {
+                throw new UnsupportedOperationException(getClass() + ".getText");
+            }
+
             @Override
             public CommentStyle getStyle() {
-                return CommentStyle.JAVADOC;
+                throw new UnsupportedOperationException(getClass() + ".getStyle");
             }
 
             @Override
             public boolean isDeprecated() {
-                return false;
+                throw new UnsupportedOperationException(getClass() + ".isDeprecated");
             }
         };
         Pair<List<DCTree>, List<DCTree>> pair = splitBody(fullBody);
@@ -347,6 +355,13 @@ public DCLiteral newLiteralTree(TextTree text) {
         return tree;
     }
 
+    @Override @DefinedBy(Api.COMPILER_TREE)
+    public DCRawText newRawTextTree(DocTree.Kind kind, String text) {
+        DCTree.DCRawText tree = new DCRawText(kind, text);
+        tree.pos = pos;
+        return tree;
+    }
+
     @Override @DefinedBy(Api.COMPILER_TREE)
     public DCParam newParamTree(boolean isTypeParameter, IdentifierTree name, List<? extends DocTree> description) {
         DCParam tree = new DCParam(isTypeParameter, (DCIdentifier) name, cast(description));
@@ -574,34 +589,29 @@ Pair<List<DCTree>, List<DCTree>> splitBody(List<? extends DocTree> list) {
                             foundFirstSentence = true;
                         }
 
-                        case TEXT -> {
-                            var dtPos = dt.pos;
-                            var s = ((DCText) dt).getBody();
-                            var peekedNext = iter.hasNext()
-                                    ? alist.get(iter.nextIndex())
-                                    : null;
-                            int sbreak = getSentenceBreak(s, peekedNext);
-                            if (sbreak > 0) {
-                                var fsPart = m.at(dtPos).newTextTree(s.substring(0, sbreak).stripTrailing());
+                        case TEXT, MARKDOWN -> {
+                            var peekedNext = iter.hasNext() ? alist.get(iter.nextIndex()) : null;
+                            var content = getContent(dt);
+                            int breakOffset = getSentenceBreak(dt.getKind(), content, peekedNext);
+                            if (breakOffset > 0) {
+                                // the end of sentence is within the current node;
+                                // split it, skipping whitespace in between the two parts
+                                var fsPart = newNode(dt.getKind(), dt.pos, content.substring(0, breakOffset).stripTrailing());
                                 fs.add(fsPart);
-                                int offsetPos = skipWhiteSpace(s, sbreak);
-                                if (offsetPos > 0) {
-                                    DCText bodyPart = m.at(dtPos + offsetPos).newTextTree(s.substring(offsetPos));
+                                int wsOffset = skipWhiteSpace(content, breakOffset);
+                                if (wsOffset > 0) {
+                                    var bodyPart = newNode(dt.getKind(), dt.pos + wsOffset, content.substring(wsOffset));
                                     body.add(bodyPart);
                                 }
                                 foundFirstSentence = true;
-                            } else if (peekedNext != null) {
-                                // if the next doctree is a break, remove trailing spaces
-                                if (isSentenceBreak(peekedNext, false)) {
-                                    DCTree next = iter.next();
-                                    DCText fsPart = m.at(dtPos).newTextTree(s.stripTrailing());
-                                    fs.add(fsPart);
-                                    body.add(next);
-                                    foundFirstSentence = true;
-                                } else {
-                                    fs.add(dt);
-                                }
+                            } else if (peekedNext != null && isSentenceBreak(peekedNext, false)) {
+                                // the next node is a sentence break, so this is the end of the first sentence;
+                                // remove trailing spaces
+                                var fsPart = newNode(dt.getKind(), dt.pos, content.stripTrailing());
+                                fs.add(fsPart);
+                                foundFirstSentence = true;
                             } else {
+                                // no sentence break found; keep scanning
                                 fs.add(dt);
                             }
                         }
@@ -633,34 +643,20 @@ Pair<List<DCTree>, List<DCTree>> splitBody(List<? extends DocTree> list) {
             }
         }
 
-        /*
-         * Computes the first sentence break, a simple dot-space algorithm.
-         */
-        private int defaultSentenceBreak(String s) {
-            // scan for period followed by whitespace
-            int period = -1;
-            for (int i = 0; i < s.length(); i++) {
-                switch (s.charAt(i)) {
-                    case '.':
-                        period = i;
-                        break;
-
-                    case ' ':
-                    case '\f':
-                    case '\n':
-                    case '\r':
-                    case '\t':
-                        if (period >= 0) {
-                            return i;
-                        }
-                        break;
+        private String getContent(DCTree dt) {
+            return switch (dt.getKind()) {
+                case TEXT -> ((DCText) dt).text;
+                case MARKDOWN -> ((DCRawText) dt).code;
+                default -> throw new IllegalArgumentException(dt.getKind().toString());
+            };
+        }
 
-                    default:
-                        period = -1;
-                        break;
-                }
-            }
-            return -1;
+        private DCTree newNode(DocTree.Kind kind, int pos, String text) {
+            return switch (kind) {
+                case TEXT -> m.at(pos).newTextTree(text);
+                case MARKDOWN -> m.at(pos).newRawTextTree(kind, text);
+                default -> throw new IllegalArgumentException(kind.toString());
+            };
         }
 
         /*
@@ -683,36 +679,53 @@ private int defaultSentenceBreak(String s) {
          * Therefore, we have to probe further to determine whether
          * there really is a sentence break or not at the end of this run of text.
          */
-        private int getSentenceBreak(String s, DCTree nextTree) {
+        private int getSentenceBreak(DocTree.Kind kind, String s, DCTree nextTree) {
             BreakIterator breakIterator = m.trees.getBreakIterator();
             if (breakIterator == null) {
-                return defaultSentenceBreak(s);
+                return defaultSentenceBreak(kind, s);
             }
-            breakIterator.setText(s);
+
+            // If there is a paragraph break in a run of Markdown text, restrict the
+            // search to the first paragraph, to avoid beginning-of-line Markdown constructs
+            // confusing the sentence breaker.
+            String s2 = normalize(kind, kind == Kind.MARKDOWN ? firstParaText(s) : s);
+            breakIterator.setText(s2);
             final int sbrk = breakIterator.next();
-            // This is the last doctree, found the droid we are looking for
-            if (nextTree == null) {
+
+            switch (kind) {
+                case MARKDOWN -> {
+                    int endParaPos = endParaPos(s2);
+                    if (endParaPos != -1) {
+                        return Math.min(sbrk, endParaPos);
+                    }
+                }
+            }
+
+            // If this is the last doctree, or if there was a paragraph break in a run
+            // of Markdown text, then we found the droid we are looking for
+            if (nextTree == null || kind == Kind.MARKDOWN && s2.length() < s.length()) {
                 return sbrk;
             }
 
-            // If the break is well within the span of the string ie. not
+            // If the break is well within the span of the string i.e. not
             // at EOL, then we have a clear break.
             if (sbrk < s.length() - 1) {
                 return sbrk;
             }
 
-            if (nextTree.getKind() == Kind.TEXT) {
-                // Two adjacent text trees, a corner case, perhaps
-                // produced by a tool synthesizing a doctree. In
-                // this case, does the break lie within the first span,
-                // then we have the droid, otherwise allow the callers
-                // logic to handle the break in the adjacent doctree.
-                TextTree ttnext = (TextTree) nextTree;
-                String combined = s + ttnext.getBody();
-                breakIterator.setText(combined);
-                int sbrk2 = breakIterator.next();
-                if (sbrk < sbrk2) {
-                    return sbrk;
+            switch (nextTree.getKind()) {
+                case TEXT, MARKDOWN -> {
+                    // Two adjacent text trees, a corner case, perhaps
+                    // produced by a tool synthesizing a doctree. In
+                    // this case, does the break lie within the first span,
+                    // then we have the droid, otherwise allow the callers
+                    // logic to handle the break in the adjacent doctree.
+                    String combined = s2 + normalize(nextTree.getKind(), getContent(nextTree));
+                    breakIterator.setText(combined);
+                    int sbrk2 = breakIterator.next();
+                    if (sbrk < sbrk2) {
+                        return sbrk;
+                    }
                 }
             }
 
@@ -733,6 +746,69 @@ private int getSentenceBreak(String s, DCTree nextTree) {
             return -1; // indeterminate at this time
         }
 
+        /*
+         * Computes the first sentence break, a simple dot-space algorithm.
+         */
+        private int defaultSentenceBreak(DocTree.Kind kind, String s) {
+            String s2 = normalize(kind, s);
+
+            // scan for period followed by whitespace
+            int period = -1;
+            for (int i = 0; i < s2.length(); i++) {
+                switch (s2.charAt(i)) {
+                    case '.':
+                        period = i;
+                        break;
+
+                    case ' ':
+                    case '\f':
+                    case '\n':
+                    case '\r':
+                    case '\t':
+                        if (period >= 0) {
+                            switch (kind) {
+                                case MARKDOWN -> {
+                                    int endParaPos = endParaPos(s2);
+                                    return endParaPos == -1 || i < endParaPos ? i : endParaPos;
+                                }
+                                case TEXT -> {
+                                    return i;
+                                }
+                                default -> throw new IllegalArgumentException(kind.toString());
+                            }
+                        }
+                        break;
+
+                    default:
+                        period = -1;
+                        break;
+                }
+            }
+
+            return switch (kind) {
+                case MARKDOWN -> endParaPos(s2); // may be -1
+                case TEXT -> -1;
+                default -> throw new IllegalArgumentException(kind.toString());
+            };
+        }
+
+        // End of paragraph is newline, followed by a blank line or the beginning of the next block.
+        // - + * are list markers
+        // # = - are for headings
+        // - _ * are for thematic breaks
+        // >     is for block quotes
+        private static final Pattern endPara = Pattern.compile("\n(([ \t]*\n)|( {0,3}[-+*#=_>]))");
+
+        private static int endParaPos(String s) {
+            Matcher m = endPara.matcher(s);
+            return m.find() ? m.start() : -1;
+        }
+
+        private static String firstParaText(String s) {
+            int endParaPos = endParaPos(s);
+            return endParaPos == -1 ? s : s.substring(0, endParaPos);
+        }
+
         private boolean isSentenceBreak(DCTree dt, boolean isFirstDocTree) {
             switch (dt.getKind()) {
                 case START_ELEMENT:
@@ -762,6 +838,75 @@ private int skipWhiteSpace(String s, int start) {
             }
             return -1;
         }
+
+        private String normalize(DocTree.Kind kind, String s) {
+            return switch (kind) {
+                case TEXT -> s;
+                case MARKDOWN -> normalizeMarkdown(s);
+                default -> throw new IllegalArgumentException(kind.toString());
+            };
+        }
+
+        // Returns a string in which any periods that should not be considered
+        // as ending a sentence are replaced by dashes.  This specifically
+        // includes periods in code spans and links.
+        private String normalizeMarkdown(String s) {
+            StringBuilder sb = new StringBuilder();
+            int slen = s.length();
+            int i = 0;
+            while (i < slen) {
+                char ch = s.charAt(i);
+                switch (ch) {
+                    case '\\' -> {
+                        sb.append(ch);
+                        i++;
+                        if (i < slen) {
+                            sb.append(s.charAt(i));
+                            i++;
+                        }
+                    }
+
+                    case '<' -> i = skip(sb, s, i, ch, '>');
+                    case '[' -> i = skip(sb, s, i, ch, ']');
+                    case '(' -> i = skip(sb, s, i, ch, ')');
+
+                    case '`' -> {
+                        int start = i;
+                        i++;
+                        while (i < slen && s.charAt(i) == '`') {
+                            i++;
+                        }
+                        String prefix = s.substring(start, i);
+                        sb.append(prefix);
+                        int j = s.indexOf(prefix, i);
+                        if (j > i) {
+                            sb.append(s.substring(i, j).replace('.', '-'));
+                            sb.append(prefix);
+                            i = j + prefix.length();
+                        }
+                    }
+
+                    default -> {
+                        sb.append(ch);
+                        i++;
+                    }
+                }
+            }
+
+            return sb.toString();
+        }
+
+        private int skip(StringBuilder sb, String s, int i, char ch, char term) {
+            sb.append(ch);
+            i++;
+            int j = s.indexOf(term, i);
+            if (j != -1) {
+                sb.append(s.substring(i, j).replace('.', '-'));
+                return j;
+            } else {
+                return i;
+            }
+        }
     }
 
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
index 42cfd9ac675..54917c90dc2 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
@@ -478,13 +478,6 @@ public static String getCommentText(Env<?> env, JCTree tree) {
         return (docComments == null) ? null : docComments.getCommentText(tree);
     }
 
-    public static DCTree.DCDocComment getCommentTree(Env<?> env, JCTree tree) {
-        DocCommentTable docComments = (tree.hasTag(JCTree.Tag.TOPLEVEL))
-                ? ((JCCompilationUnit) tree).docComments
-                : env.toplevel.docComments;
-        return (docComments == null) ? null : docComments.getCommentTree(tree);
-    }
-
     /** The position of the first statement in a block, or the position of
      *  the block itself if it is empty.
      */
diff --git a/src/jdk.compiler/share/classes/module-info.java b/src/jdk.compiler/share/classes/module-info.java
index 9b12171ef6d..63b5aa63e4c 100644
--- a/src/jdk.compiler/share/classes/module-info.java
+++ b/src/jdk.compiler/share/classes/module-info.java
@@ -233,7 +233,8 @@
         jdk.javadoc;
     exports com.sun.tools.javac.api to
         jdk.javadoc,
-        jdk.jshell;
+        jdk.jshell,
+        jdk.internal.md;
     exports com.sun.tools.javac.resources to
         jdk.jshell;
     exports com.sun.tools.javac.code to
@@ -253,17 +254,20 @@
     exports com.sun.tools.javac.model to
         jdk.javadoc;
     exports com.sun.tools.javac.parser to
-        jdk.jshell;
+        jdk.jshell,
+        jdk.internal.md;
     exports com.sun.tools.javac.platform to
         jdk.jdeps,
         jdk.javadoc;
     exports com.sun.tools.javac.tree to
         jdk.javadoc,
-        jdk.jshell;
+        jdk.jshell,
+        jdk.internal.md;
     exports com.sun.tools.javac.util to
         jdk.jdeps,
         jdk.javadoc,
-        jdk.jshell;
+        jdk.jshell,
+        jdk.internal.md;
     exports jdk.internal.shellsupport.doc to
         jdk.jshell;
 
@@ -271,6 +275,7 @@
     uses com.sun.source.util.Plugin;
     uses com.sun.tools.doclint.DocLint;
     uses com.sun.tools.javac.platform.PlatformProvider;
+    uses com.sun.tools.javac.api.JavacTrees.DocCommentTreeTransformer;
 
     provides java.util.spi.ToolProvider with
         com.sun.tools.javac.main.JavacToolProvider;
diff --git a/src/jdk.compiler/share/man/javac.1 b/src/jdk.compiler/share/man/javac.1
index 6586bcaf83f..de374e7d0c7 100644
--- a/src/jdk.compiler/share/man/javac.1
+++ b/src/jdk.compiler/share/man/javac.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1994, 2023, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
 .\" This code is free software; you can redistribute it and/or modify it
@@ -563,6 +563,9 @@ module.
 Specifies the fallback target module for files created by annotation
 processors, if none is specified or inferred.
 .TP
+\f[V]--disable-line-doc-comments\f[R]
+Disables support for documentation comments with lines beginning ///.
+.TP
 \f[V]-Djava.endorsed.dirs=\f[R]\f[I]dirs\f[R]
 Overrides the location of the endorsed standards path.
 .RS
diff --git a/src/jdk.dynalink/share/classes/jdk/dynalink/StandardOperation.java b/src/jdk.dynalink/share/classes/jdk/dynalink/StandardOperation.java
index 176a87acd36..cb6490c890d 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/StandardOperation.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/StandardOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -95,6 +95,8 @@ public enum StandardOperation implements Operation {
      * <code>(receiver)&rarr;void</code> when used with {@link NamedOperation},
      * with all parameters being of any type (either primitive
      * or reference). This operation must always be used as part of a {@link NamespaceOperation}.
+     *
+     * @since 10
      */
     REMOVE,
     /**
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/Generation.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/Generation.java
index 0b152a1f95f..7fcac7eb39b 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/Generation.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/Generation.java
@@ -50,9 +50,6 @@ public abstract class Generation extends VMObject {
   private static long          reservedFieldOffset;
   private static long          virtualSpaceFieldOffset;
   protected static final int  K = 1024;
-  // Fields for class StatRecord
-  private static Field         statRecordField;
-  private static CIntegerField invocationField;
 
   static {
     VM.registerVMInitializedObserver(new Observer() {
@@ -67,20 +64,12 @@ private static synchronized void initialize(TypeDataBase db) {
 
     reservedFieldOffset     = type.getField("_reserved").getOffset();
     virtualSpaceFieldOffset = type.getField("_virtual_space").getOffset();
-    // StatRecord
-    statRecordField         = type.getField("_stat_record");
-    type                    = db.lookupType("Generation::StatRecord");
-    invocationField         = type.getCIntegerField("invocations");
   }
 
   public Generation(Address addr) {
     super(addr);
   }
 
-  public int invocations() {
-    return getStatRecord().getInvocations();
-  }
-
   /** The maximum number of object bytes the generation can currently
       hold. */
   public abstract long capacity();
@@ -123,19 +112,4 @@ protected VirtualSpace virtualSpace() {
 
   public void print() { printOn(System.out); }
   public abstract void printOn(PrintStream tty);
-
-  public static class StatRecord extends VMObject {
-    public StatRecord(Address addr) {
-      super(addr);
-    }
-
-    public int getInvocations() {
-      return (int) invocationField.getValue(addr);
-    }
-
-  }
-
-  private StatRecord getStatRecord() {
-    return VMObjectFactory.newObject(StatRecord.class, addr.addOffsetTo(statRecordField.getOffset()));
-  }
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/SerialHeap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/SerialHeap.java
index 397d0e0b762..89741177140 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/SerialHeap.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/SerialHeap.java
@@ -95,11 +95,11 @@ public void liveRegionsIterate(LiveRegionsClosure closure) {
   public void printOn(PrintStream tty) {
     tty.println("SerialHeap:");
 
-    tty.println("Young Generation - Invocations: " + youngGen().invocations());
+    tty.println("Young Generation: ");
     youngGen().printOn(tty);
     tty.println();
 
-    tty.println("Old Generation - Invocations: " + oldGen().invocations());
+    tty.println("Old Generation: ");
     oldGen().printOn(tty);
     tty.println();
   }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
index 64255b5ab60..aa90f68c1cf 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
@@ -30,6 +30,7 @@
 import java.io.Reader;
 import java.io.UncheckedIOException;
 import java.nio.charset.Charset;
+import java.util.Locale;
 
 import jdk.internal.io.JdkConsole;
 import jdk.internal.io.JdkConsoleProvider;
@@ -84,21 +85,16 @@ public Reader reader() {
         }
 
         @Override
-        public JdkConsole format(String fmt, Object ... args) {
-            writer().format(fmt, args).flush();
+        public JdkConsole format(Locale locale, String format, Object ... args) {
+            writer().format(locale, format, args).flush();
             return this;
         }
 
         @Override
-        public JdkConsole printf(String format, Object ... args) {
-            return format(format, args);
-        }
-
-        @Override
-        public String readLine(String fmt, Object ... args) {
+        public String readLine(Locale locale, String format, Object ... args) {
             try {
                 initJLineIfNeeded();
-                return jline.readLine(fmt.formatted(args).replace("%", "%%"));
+                return jline.readLine(String.format(locale, format, args).replace("%", "%%"));
             } catch (EndOfFileException eofe) {
                 return null;
             }
@@ -106,14 +102,14 @@ public String readLine(String fmt, Object ... args) {
 
         @Override
         public String readLine() {
-            return readLine("");
+            return readLine(Locale.getDefault(Locale.Category.FORMAT), "");
         }
 
         @Override
-        public char[] readPassword(String fmt, Object ... args) {
+        public char[] readPassword(Locale locale, String format, Object ... args) {
             try {
                 initJLineIfNeeded();
-                return jline.readLine(fmt.formatted(args).replace("%", "%%"), '\0')
+                return jline.readLine(String.format(locale, format, args).replace("%", "%%"), '\0')
                             .toCharArray();
             } catch (EndOfFileException eofe) {
                 return null;
@@ -124,7 +120,7 @@ public char[] readPassword(String fmt, Object ... args) {
 
         @Override
         public char[] readPassword() {
-            return readPassword("");
+            return readPassword(Locale.getDefault(Locale.Category.FORMAT), "");
         }
 
         @Override
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java
index 557024a121e..32663d414ce 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java
@@ -76,7 +76,9 @@ public void setDelayLineWrap(boolean v) {
 
     public void resize(int rows, int columns) {
         if (rows == 0 || columns == 0) {
-            columns = 1;
+            // OpenJDK patch. Original code assigned 1 to columns, which ended up
+            // appending " \b" to the prompt in certain cases.
+            columns = Integer.MAX_VALUE - 1;
             rows = 1;
         }
         if (this.rows != rows || this.columns != columns) {
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/markdown/MarkdownTransformer.java b/src/jdk.internal.md/share/classes/jdk/internal/markdown/MarkdownTransformer.java
new file mode 100644
index 00000000000..bd2521e4efa
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/markdown/MarkdownTransformer.java
@@ -0,0 +1,976 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.markdown;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.MatchResult;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import com.sun.source.doctree.DocCommentTree;
+import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.DocTreeVisitor;
+import com.sun.source.doctree.RawTextTree;
+import com.sun.source.util.DocTreeScanner;
+import com.sun.source.util.DocTrees;
+
+import com.sun.tools.javac.api.JavacTrees;
+import com.sun.tools.javac.parser.ReferenceParser;
+import com.sun.tools.javac.tree.DCTree;
+import com.sun.tools.javac.tree.DocTreeMaker;
+import com.sun.tools.javac.util.DefinedBy;
+
+import jdk.internal.org.commonmark.ext.gfm.tables.TablesExtension;
+import jdk.internal.org.commonmark.internal.InlineParserImpl;
+import jdk.internal.org.commonmark.node.AbstractVisitor;
+import jdk.internal.org.commonmark.node.Link;
+import jdk.internal.org.commonmark.node.LinkReferenceDefinition;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.node.Text;
+import jdk.internal.org.commonmark.parser.IncludeSourceSpans;
+import jdk.internal.org.commonmark.parser.InlineParser;
+import jdk.internal.org.commonmark.parser.InlineParserContext;
+import jdk.internal.org.commonmark.parser.InlineParserFactory;
+import jdk.internal.org.commonmark.parser.Parser;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterProcessor;
+
+import static com.sun.tools.javac.util.Position.NOPOS;
+
+/**
+ * A class to transform a {@code DocTree} node into a similar one with
+ * doc-comment "extensions" translated into equivalent standard {@code DocTree} nodes.
+ *
+ * <p>The primary extension is to allow references to program elements to be
+ * translated to {@code {@link ...}} or {@code {@linkplain ...}} tags.
+ */
+public class MarkdownTransformer implements JavacTrees.DocCommentTreeTransformer {
+
+    /**
+     * Public no-args constructor, suitable for use with {@link java.util.ServiceLoader}.
+     */
+    public MarkdownTransformer() { }
+
+    public String name() {
+        return "standard";
+    }
+
+    @Override @DefinedBy(DefinedBy.Api.COMPILER_TREE)
+    public DocCommentTree transform(DocTrees trees, DocCommentTree tree) {
+        if (!(trees instanceof JavacTrees t)) {
+            throw new IllegalArgumentException("class not supported: " + trees.getClass());
+        }
+        if (!(tree instanceof DCTree.DCDocComment dc)) {
+            throw new IllegalArgumentException("class not supported: " + tree.getClass());
+        }
+
+        return isMarkdown(dc) ? new DCTransformer(t).transform(dc) : dc;
+    }
+
+    private boolean isMarkdown(DocCommentTree node) {
+        return isMarkdownVisitor.visitDocComment(node, null);
+    }
+
+    /**
+     * A fast scanner for detecting Markdown nodes in documentation comment nodes.
+     * The scanner returns as soon as any Markdown node is found.
+     */
+    private static final DocTreeVisitor<Boolean, Void> isMarkdownVisitor = new DocTreeScanner<>() {
+        @Override
+        public Boolean scan(Iterable<? extends DocTree> nodes, Void ignore) {
+            if (nodes != null) {
+                for (DocTree node : nodes) {
+                    Boolean b = scan(node, ignore);
+                    if (b == Boolean.TRUE) {
+                        return b;
+                    }
+                }
+            }
+            return false;
+        }
+
+        @Override
+        public Boolean scan(DocTree node, Void ignore) {
+            return node != null && node.getKind() == DocTree.Kind.MARKDOWN ? Boolean.TRUE : super.scan(node, ignore);
+        }
+
+        @Override
+        public Boolean reduce(Boolean r1, Boolean r2) {
+            return r1 == Boolean.TRUE || r2 == Boolean.TRUE;
+        }
+    };
+
+    private static final char PLACEHOLDER = '\uFFFC'; // Unicode Object Replacement Character
+
+    private static class DCTransformer {
+        private final DocTreeMaker m;
+        private final ReferenceParser refParser;
+
+        // a dynamically generated scheme for the URLs of automatically generated references;
+        // to allow user-generated code URLs, change this to just "code:"
+        private final String autorefScheme = "code-" + Integer.toHexString(hashCode()) + ":";
+
+        DCTransformer(JavacTrees t) {
+            m = t.getDocTreeFactory();
+            refParser = new ReferenceParser(t.getParserFactory());
+        }
+
+        /**
+         * Transforms a doc tree node.
+         * This node dispatches to a more specific overload, based on the kind of the node.
+         * The result may be the same as the argument if no transformations were made.
+         *
+         * @param tree the tree node
+         * @return a tree with any "extensions" converted into tags
+         */
+        public DCTree transform(DCTree tree) {
+            // The following switch statement could eventually be converted to a
+            // pattern switch. It is intended to be a total switch, with a default
+            // to catch any omissions.
+            return switch (tree.getKind()) {
+                // The following cannot contain Markdown and so always transform to themselves.
+                case ATTRIBUTE,
+                        CODE, COMMENT,
+                        DOC_ROOT, DOC_TYPE,
+                        END_ELEMENT, ENTITY, ERRONEOUS, ESCAPE,
+                        IDENTIFIER, INHERIT_DOC,
+                        LITERAL,
+                        REFERENCE,
+                        SNIPPET, START_ELEMENT, SYSTEM_PROPERTY,
+                        TEXT,
+                        VALUE -> tree;
+
+                // The following may contain Markdown in at least one of their fields.
+                case AUTHOR -> transform((DCTree.DCAuthor) tree);
+                case DEPRECATED -> transform((DCTree.DCDeprecated) tree);
+                case DOC_COMMENT -> transform((DCTree.DCDocComment) tree);
+                case EXCEPTION, THROWS -> transform((DCTree.DCThrows) tree);
+                case HIDDEN -> transform((DCTree.DCHidden) tree);
+                case INDEX -> transform((DCTree.DCIndex) tree);
+                case LINK, LINK_PLAIN -> transform((DCTree.DCLink) tree);
+                case PARAM -> transform((DCTree.DCParam) tree);
+                case PROVIDES -> transform((DCTree.DCProvides) tree);
+                case RETURN -> transform((DCTree.DCReturn) tree);
+                case SEE -> transform((DCTree.DCSee) tree);
+                case SERIAL -> transform((DCTree.DCSerial) tree);
+                case SERIAL_DATA -> transform((DCTree.DCSerialData) tree);
+                case SERIAL_FIELD -> transform((DCTree.DCSerialField) tree);
+                case SINCE -> transform((DCTree.DCSince) tree);
+                case SPEC -> transform((DCTree.DCSpec) tree);
+                case SUMMARY -> transform((DCTree.DCSummary) tree);
+                case UNKNOWN_BLOCK_TAG -> transform((DCTree.DCUnknownBlockTag) tree);
+                case UNKNOWN_INLINE_TAG -> transform((DCTree.DCUnknownInlineTag) tree);
+                case USES -> transform((DCTree.DCUses) tree);
+                case VERSION -> transform((DCTree.DCVersion) tree);
+
+                // This should never be handled directly; instead it should be handled as part of
+                //   transform(List<? extends DocTree>);
+                // because a Markdown node has the potential to be split into multiple nodes.
+                case MARKDOWN -> throw new IllegalArgumentException(tree.getKind().toString());
+
+                // Catch in case new kinds are added
+                default -> throw new IllegalArgumentException(tree.getKind().toString());
+            };
+        }
+
+        /**
+         * Transforms a list of doc tree nodes.
+         * If any of the nodes contain Markdown, the Markdown source is parsed
+         * and analyzed for any transformations.
+         * Any non-Markdown nodes are individually transformed.
+         *
+         * @param trees the list of tree nodes to be transformed
+         * @return the transformed list
+         */
+        private List<? extends DCTree> transform(List<? extends DCTree> trees) {
+            boolean hasMarkdown = trees.stream().anyMatch(t -> t.getKind() == DocTree.Kind.MARKDOWN);
+            if (hasMarkdown) {
+                var sourceBuilder = new StringBuilder();
+                var replacements = new ArrayList<>();
+
+                /*
+                 * Step 1: Convert the trees into a string containing Markdown text,
+                 *         using Unicode Object Replacement characters to mark the positions
+                 *         of non-Markdown content.
+                 */
+                for (DCTree tree : trees) {
+                    if (tree instanceof RawTextTree t) {
+                        if (t.getKind() != DocTree.Kind.MARKDOWN) {
+                            throw new IllegalStateException(t.getKind().toString());
+                        }
+                        String code = t.getContent();
+                        // handle the (unlikely) case of any U+FFFC characters existing in the code
+                        int start = 0;
+                        int pos;
+                        while ((pos = code.indexOf(PLACEHOLDER, start)) != -1) {
+                            replacements.add(PLACEHOLDER);
+                            start = pos + 1;
+                        }
+                        sourceBuilder.append(code);
+                    } else {
+                        replacements.add(transform(tree));
+                        sourceBuilder.append(PLACEHOLDER);
+                    }
+                }
+
+                /*
+                 * Step 2: Build a parser, and configure it to accept additional syntactic constructs,
+                 *         such as reference-style links to program elements.
+                 */
+                String source = sourceBuilder.toString();
+                Parser parser = Parser.builder()
+                        .extensions(List.of(TablesExtension.create()))
+                        .inlineParserFactory(new AutoRefInlineParserFactory(refParser, autorefScheme))
+                        .includeSourceSpans(IncludeSourceSpans.BLOCKS_AND_INLINES)
+                        .build();
+                Node document = parser.parse(source);
+
+                /*
+                 * Step 3: Analyze the parsed tree, converting it back to a list of DocTree nodes,
+                 *         consisting of Markdown text interspersed with any pre-existing
+                 *         DocTree nodes, as well as any new nodes created by converting
+                 *         parts of the Markdown tree into nodes for old-style javadoc tags.
+                 */
+                var firstTreePos = trees.getFirst().getStartPosition();
+                Lower v = new Lower(m, document, source, firstTreePos, replacements, autorefScheme);
+                document.accept(v);
+
+                return v.getTrees();
+
+            } else {
+                var list2 = trees.stream()
+                        .map(this::transform)
+                        .toList();
+                return equal(list2, trees) ? trees : list2;
+            }
+        }
+
+        //-----------------------------------------------------------------------------
+        //
+        // The following {@code transform} methods invoke {@code transform} on
+        // any children that may contain Markdown. If the transformations on
+        // the children are all identity transformations (that is the result
+        // of the transformations are the same as the originals) then the
+        // result of the overall transform is the original object. But if
+        // any transformation on the children is not an identity transformation
+        // then the result is a new node containing the transformed values.
+        //
+        // Thus, we only duplicate the parts of the tree that have changed,
+        // and we do not duplicate the parts of the tree that have not changed.
+
+        private DCTree.DCAuthor transform(DCTree.DCAuthor tree) {
+            var name2 = transform(tree.name);
+            return (equal(name2, tree.name))
+                    ? tree
+                    : m.at(tree.pos).newAuthorTree(name2);
+        }
+
+        private DCTree.DCDeprecated transform(DCTree.DCDeprecated tree) {
+            var body2 = transform(tree.body);
+            return (equal(body2, tree.body))
+                    ? tree
+                    : m.at(tree.pos).newDeprecatedTree(body2);
+        }
+
+        public DCTree.DCDocComment transform(DCTree.DCDocComment tree) {
+            var fullBody2 = transform(tree.fullBody);
+            var tags2 = transform(tree.tags);
+            // Note: preamble and postamble only appear in HTML files, so should always be
+            // null or empty for doc comments and/or Markdown files
+            var pre2 = transform(tree.preamble);
+            var post2 = transform(tree.postamble);
+            return (equal(fullBody2, tree.fullBody) && equal(tags2, tree.tags)
+                    && equal(pre2, tree.preamble) && equal(post2, tree.postamble))
+                    ? tree
+                    : m.at(tree.pos).newDocCommentTree(tree.comment, fullBody2, tags2, pre2, post2);
+        }
+
+        private DCTree.DCHidden transform(DCTree.DCHidden tree) {
+            var body2 = transform(tree.body);
+            return (equal(body2, tree.body))
+                    ? tree
+                    : m.at(tree.pos).newHiddenTree(body2);
+        }
+
+        private DCTree.DCIndex transform(DCTree.DCIndex tree) {
+            // The public API permits a DocTree, although in the implementation, it is always a TextTree.
+            var term2 = transform(tree.term);
+            var desc2 = transform(tree.description);
+            return (equal(term2, tree.term) && equal(desc2, tree.description))
+                    ? tree
+                    : m.at(tree.pos).newIndexTree(term2, desc2).setEndPos(tree.getEndPos());
+        }
+
+        private DCTree.DCLink transform(DCTree.DCLink tree) {
+            var label2 = transform(tree.label);
+            return (equal(label2, tree.label))
+                    ? tree
+                    : switch (tree.getKind()) {
+                case LINK -> m.at(tree.pos).newLinkTree(tree.ref, label2).setEndPos(tree.getEndPos());
+                case LINK_PLAIN -> m.at(tree.pos).newLinkPlainTree(tree.ref, label2).setEndPos(tree.getEndPos());
+                default -> throw new IllegalArgumentException(tree.getKind().toString());
+            };
+        }
+
+        private DCTree.DCParam transform(DCTree.DCParam tree) {
+            var desc2 = transform(tree.description);
+            return (equal(desc2, tree.description))
+                    ? tree
+                    : m.at(tree.pos).newParamTree(tree.isTypeParameter, tree.name, desc2);
+        }
+
+        private DCTree.DCProvides transform(DCTree.DCProvides tree) {
+            var desc2 = transform(tree.description);
+            return (equal(desc2, tree.description))
+                    ? tree
+                    : m.at(tree.pos).newProvidesTree(tree.serviceType, desc2);
+        }
+
+        private DCTree.DCReturn transform(DCTree.DCReturn tree) {
+            var desc2 = transform(tree.description);
+            return (equal(desc2, tree.description))
+                    ? tree
+                    : m.at(tree.pos).newReturnTree(tree.inline, desc2).setEndPos(tree.getEndPos());
+        }
+
+        private DCTree.DCSee transform(DCTree.DCSee tree) {
+            List<? extends DocTree> ref2 = transform(tree.reference);
+            return (equal(ref2, tree.getReference()))
+                    ? tree
+                    : m.at(tree.pos).newSeeTree(ref2);
+        }
+
+        private DCTree.DCSerial transform(DCTree.DCSerial tree) {
+            var desc2 = transform(tree.description);
+            return (equal(desc2, tree.description))
+                    ? tree
+                    : m.at(tree.pos).newSerialTree(desc2);
+        }
+
+        private DCTree.DCSerialData transform(DCTree.DCSerialData tree) {
+            var desc2 = transform(tree.description);
+            return (equal(desc2, tree.description))
+                    ? tree
+                    : m.at(tree.pos).newSerialDataTree(desc2);
+        }
+
+        private DCTree.DCSerialField transform(DCTree.DCSerialField tree) {
+            var desc2 = transform(tree.description);
+            return (equal(desc2, tree.description))
+                    ? tree
+                    : m.at(tree.pos).newSerialFieldTree(tree.name, tree.type, desc2);
+        }
+
+        DCTree.DCSince transform(DCTree.DCSince tree) {
+            var body2 = transform(tree.body);
+            return (equal(body2, tree.body))
+                    ? tree
+                    : m.at(tree.pos).newSinceTree(body2);
+        }
+
+        private DCTree.DCSpec transform(DCTree.DCSpec tree) {
+            var title2 = transform(tree.title);
+            return (equal(title2, tree.title))
+                    ? tree
+                    : m.at(tree.pos).newSpecTree(tree.uri, title2);
+        }
+
+        private DCTree.DCSummary transform(DCTree.DCSummary tree) {
+            var summ2 = transform(tree.summary);
+            return (equal(summ2, tree.summary))
+                    ? tree
+                    : m.at(tree.pos).newSummaryTree(summ2).setEndPos(tree.getEndPos());
+        }
+
+        private DCTree.DCThrows transform(DCTree.DCThrows tree) {
+            var desc2 = transform(tree.description);
+            return (equal(desc2, tree.description))
+                    ? tree
+                    : switch (tree.getKind()) {
+                case EXCEPTION -> m.at(tree.pos).newExceptionTree(tree.name, desc2);
+                case THROWS -> m.at(tree.pos).newThrowsTree(tree.name, desc2);
+                default -> throw new IllegalArgumentException(tree.getKind().toString());
+            };
+        }
+
+        private DCTree.DCUnknownBlockTag transform(DCTree.DCUnknownBlockTag tree) {
+            var cont2 = transform(tree.content);
+            return (equal(cont2, tree.content))
+                    ? tree
+                    : m.at(tree.pos).newUnknownBlockTagTree(tree.name, cont2);
+        }
+
+        private DCTree.DCUnknownInlineTag transform(DCTree.DCUnknownInlineTag tree) {
+            var cont2 = transform(tree.content);
+            return (equal(cont2, tree.content))
+                    ? tree
+                    : m.at(tree.pos).newUnknownInlineTagTree(tree.name, cont2).setEndPos(tree.getEndPos());
+        }
+
+        private DCTree.DCUses transform(DCTree.DCUses tree) {
+            var desc2 = transform(tree.description);
+            return (equal(desc2, tree.description))
+                    ? tree
+                    : m.at(tree.pos).newUsesTree(tree.serviceType, desc2);
+        }
+
+        private DCTree.DCVersion transform(DCTree.DCVersion tree) {
+            var body2 = transform(tree.body);
+            return (equal(body2, tree.body))
+                    ? tree
+                    : m.at(tree.pos).newVersionTree(body2);
+        }
+
+        /**
+         * Shallow "equals" for two doc tree nodes.
+         *
+         * @param <T> the type of the items
+         * @param item1 the first item
+         * @param item2 the second item
+         * @return {@code true} if the items are reference-equal, and {@code false} otherwise
+         */
+        private static <T extends DocTree> boolean equal(T item1, T item2) {
+            return item1 == item2;
+        }
+
+        /**
+         * Shallow "equals" for two lists of doc tree nodes.
+         *
+         * @param <T> the type of the items
+         * @param list1 the first item
+         * @param list2 the second item
+         * @return {@code true} if the items are reference-equal, and {@code false} otherwise
+         */
+        private static <T extends DocTree> boolean equal(List<? extends T> list1, List<? extends T> list2) {
+            if (list1 == null || list2 == null) {
+                return (list1 == list2);
+            }
+
+            if (list1.size() != list2.size()) {
+                return false;
+            }
+
+            var iter1 = list1.iterator();
+            var iter2 = list2.iterator();
+            while (iter1.hasNext()) {
+                var item1 = iter1.next();
+                var item2 = iter2.next();
+                if (item1 != item2) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+
+    /**
+     * An {@code InlineParserFactory} that checks any unresolved link references in
+     * reference links. If an unresolved link reference appears to be a reference to a
+     * program element, such as may be used in {@code @see ...} or {@code {@link ...}}
+     * tags, it generates a synthetic {@code LinkReferenceDefinition}.
+     *
+     * The reference is not validated to ensure it refers to any existing element.
+     *
+     * The primary function of this {@code InlineParserFactory} is to provide
+     * a custom implementation of an {@code InlineParserContext} via the
+     * {@code create(InlineParserContext inlineParserContext)} method.
+     * It is this {@code InlineParserContext} that actually manages the set
+     * of link reference definitions.
+     *
+     * This {@code InlineParserFactory} is intended to be registered with a
+     * {@code Parser.Builder} using {@code setInlineParserFactory}.
+     */
+    private static class AutoRefInlineParserFactory implements InlineParserFactory {
+        private final ReferenceParser refParser;
+        private final String autorefScheme;
+
+        AutoRefInlineParserFactory(ReferenceParser refParser,
+                                   String autorefScheme) {
+            this.refParser = refParser;
+            this.autorefScheme = autorefScheme;
+        }
+
+        /**
+         * Creates a parser with a modified {@code InlineParserContext} that
+         * delegates to the standard {@code InlineParserContext} and also
+         * checks unresolved link references.
+         *
+         * @param inlineParserContext the standard {@code InlineParserContext}
+         * @return the {@code InlineParser}
+         */
+        @Override
+        public InlineParser create(InlineParserContext inlineParserContext) {
+            return new InlineParserImpl(new InlineParserContext() {
+
+                @Override
+                public List<DelimiterProcessor> getCustomDelimiterProcessors() {
+                    return inlineParserContext.getCustomDelimiterProcessors();
+                }
+
+                /**
+                 * {@inheritDoc}
+                 *
+                 * If the given label does not match any explicitly defined
+                 * link reference definition, but does match a reference
+                 * to a program element, a synthetic link reference definition
+                 * is returned, with the label prefixed by the {@code autorefScheme}.
+                 *
+                 * @param label the link label to look up
+                 * @return the link reference definition for the label, or {@code null}
+                 */
+                @Override
+                public LinkReferenceDefinition getLinkReferenceDefinition(String label) {
+                    // In CommonMark, square brackets characters need to be escaped within a link label.
+                    // See https://spec.commonmark.org/0.30/#link-label
+                    //   Unescaped square bracket characters are not allowed inside the opening
+                    //   and closing square brackets of link labels.
+                    // The escape characters are still present here in the label,
+                    // so we remove them before creating the autoref URL.
+                    // Note that the characters always appear together as a pair in API references.
+                    var l = label.replace("\\[\\]", "[]");
+                    var d = inlineParserContext.getLinkReferenceDefinition(l);
+                    return d == null && isReference(l)
+                            ? new LinkReferenceDefinition("", autorefScheme + l, "")
+                            : d;
+                }
+            });
+        }
+
+        /**
+         * {@return whether a string appears to be a reference to a program element}
+         *
+         * @param s the string
+         */
+        private boolean isReference(String s) {
+            try {
+                refParser.parse(s, ReferenceParser.Mode.MEMBER_OPTIONAL);
+                return true;
+            } catch (ReferenceParser.ParseException e) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * A visitor to scan a Markdown document looking for any constructs that
+     * should be mapped to doc comment nodes.
+     *
+     * The intended use is as follows:
+     * {@snippet
+     *     Lower v = new Lower(document, source, replacements);
+     *     document.accept(v);
+     *     var result = v.getTrees();
+     * }
+     *
+     * On coordinates ...
+     *
+     * There are various position/coordinate systems in play in this code:
+     *
+     * 1. Tree positions, which correspond to positions in the original comment,
+     *    represented as a 0-based character offset within the content of the comment.
+     * 2. Positions in the source string given to the Markdown parser,
+     *    represented as a 0-based character offset within the source string.
+     *    These differ from positions in the original comment if the source string
+     *    contains U+FFFC characters representing embedded tree nodes.
+     * 3. Positions in the source string given to the Markdown parser,
+     *    represented as (line, column) values within SourceSpan nodes.
+     *    Both line and column are 0-based.
+     *    Note: SourceSpan objects never include newline characters.
+     *
+     * See {@link Lower#toSourcePos(int, int)} to convert from (line, column)
+     * coordinates to a source position.
+     * See {@link Lower#sourcePosToTreePos(int)} to convert from a source
+     * position to a position in the original comment, for use in tree nodes.
+     */
+
+    // Future opportunity:
+    //
+    // It would be possible to override {@code visit(Heading)} and
+    // check for certain recognized headings, and for those headings,
+    // check the content that follows up to but not including
+    // the next heading at the same or higher level, or end of text.
+    // When a match occurs, the heading and the content could be translated
+    // into one or more block tags. Note that any such block tags should
+    // probably be stored separately from {@code trees}, and handled
+    // appropriately by the caller of this method, either by accepting
+    // such tags, or by reporting an error if they are not applicable.
+    //
+    // A variant would be to pass in a boolean parameter to indicate
+    // whether such tags would be acceptable if found, and to ignore
+    // the heading and content if the block tag would not be acceptable.
+    //
+    // If a heading and any following content is converted to a block tag,
+    // the content should probably be removed from the tree, so that
+    // it is not handled by the call of {@code visitChildren} that
+    // invoked {@code visit(Heading)}.
+    //
+    // Overall, this would allow Markdown constructs such as the following:
+    //
+    // /// Method description.
+    // ///
+    // /// # Parameters
+    // /// * args
+    // ///
+    // /// # Returns
+    // ///   a result
+    // ///
+    // /// # Throws
+    // /// * IOException if an error occurs
+    //
+    // That being said, is it so much better than using standard block tags?
+    // It is somewhat more concise for any repeatable block tag, if we
+    // leverage the idea of a heading followed by a list.
+    private static class Lower extends AbstractVisitor {
+        private final DocTreeMaker m;
+        private final String autorefScheme;
+
+        /**
+         * The Markdown document being processed.
+         */
+        private final Node document;
+
+        /**
+         * The source for the Markdown document being processed.
+         * The document has "source spans" that indirectly point into this string
+         * using {@code (line, column)} coordinates.
+         * @see #toSourcePos(int, int)
+         */
+        private final String source;
+
+        /**
+         * An array giving the position of the first character after each newline
+         * in the source.
+         * Used to convert {@code (line, column)} coordinates to a character offset
+         * in {@code source}.
+         */
+        private final int[] sourceLineOffsets;
+
+        /**
+         * An iterator containing the values to be substituted into the generated
+         * tree when U+FFFC characters are encountered in the document.
+         * There is a 1-1 correspondence between the values returned by the
+         * iterator and the U+FFFC characters in the document.
+         * The replacement objects may be either {@code DCTree} objects or
+         * U+FFFC characters that were found in the original document.
+         */
+        private final Iterator<?> replaceIter;
+
+        /**
+         * The list of trees being built.
+         * It may be temporarily replaced while visiting the children of
+         * {@code Link} codes.
+         */
+        private List<DCTree> trees;
+
+        /**
+         * The source text being accumulated, prior to being placed in a
+         * Markdown source node ({@code RawTextTree} with kind {@code MARKDOWN}).
+         */
+        private final StringBuilder text;
+
+        /**
+         * The initial position in the enclosing comment of the source
+         * being transformed.
+         */
+        private int mainStartPos;
+
+        /**
+         * The start of source text to be copied literally when required.
+         */
+        private int copyStartPos;
+
+        /**
+         * The current adjustment from positions in {@code source} to positions
+         * in the original comment, as used in doc tree nodes.
+         * The difference arises because of the use of U+FFFC characters for
+         * embedded objects. As the document (and source) are scanned,
+         * this offset is updated when U+FFFC characters are encountered.
+         */
+        private int replaceAdjustPos;
+
+        /**
+         * The pattern for a line break.
+         * This is equivalent to the detection in the Markdown parser, so that
+         * {@code (line, column)} coordinates can be accurately converted back
+         * into source positions.
+         *
+         * @see jdk.internal.org.commonmark.internal.DocumentParser#parse(String)
+         * @see jdk.internal.org.commonmark.internal.util.Parsing#findLineBreak(CharSequence, int)
+         */
+        private static final Pattern lineBreak = Pattern.compile("\n|\r\n?");
+
+        /**
+         * Creates an instance of the visitor, given a document,
+         * the source text for the document and objects to be substituted
+         * when U+FFFC characters are encountered.
+         *
+         * Note the document does not itself contain any source text:
+         * it just contains {@code SourceSpan} objects that point into
+         * the source text using line and column indices.
+         *
+         * @param document the document to be converted
+         * @param source the source of the document to be converted
+         * @param sourcePos the position in the enclosing comment of the source to be converted
+         * @param replacements the objects to be substituted when U+FFFC is encountered
+         * @param autorefScheme the scheme used for auto-generated references
+         */
+        public Lower(DocTreeMaker docTreeMaker,
+                     Node document,
+                     String source, int sourcePos,
+                     List<?> replacements,
+                     String autorefScheme) {
+            this.m = docTreeMaker;
+            this.document = document;
+            this.source = source;
+            this.autorefScheme = autorefScheme;
+
+            sourceLineOffsets = Stream.concat(
+                            Stream.of(0),
+                            lineBreak.matcher(source).results().map(MatchResult::end))
+                    .mapToInt(Integer::intValue)
+                    .toArray();
+
+            replaceIter = replacements.iterator();
+
+            trees = new ArrayList<>();
+            text = new StringBuilder();
+            mainStartPos = sourcePos;
+            copyStartPos = 0;
+            replaceAdjustPos = 0;
+        }
+
+        /**
+         * {@return the trees that were built after using the visitor}
+         */
+        public List<DCTree> getTrees() {
+            return trees;
+        }
+
+        /**
+         * Visits a CommonMark {@code Link} node.
+         *
+         * If the destination for the link begins with the {@code autorefScheme}
+         * convert it to {@code {@link ...}} or {@code {@linkplain ...}} DocTree node.
+         * {@code {@link ...}} will be used if the content (label) for
+         * the link is the same as the reference found after the {@code code:};
+         * otherwise, {@code {@linkplain ...}} will be used.
+         *
+         * The label will be left blank for {@code {@link ...}} nodes,
+         * implying that a default label should be used, based on the
+         * program element that was referenced.
+         *
+         * @param link the link node
+         */
+        @Override
+        public void visit(Link link) {
+            String dest = link.getDestination();
+            if (dest.startsWith(autorefScheme)) {
+                // copy the source text up to the start of the node
+                copyTo(getStartPos(link));
+                // push temporary value for {@code trees} while handling the content of the node
+                var saveTrees = trees;
+                trees = new ArrayList<>();
+                try {
+                    copyStartPos = getStartPos(link.getFirstChild());
+                    visitChildren(link);
+                    copyTo(getEndPos(link.getLastChild()));
+
+                    // determine whether to use {@link ... } or {@linkplain ...}
+                    // based on whether the "link text" is the same as the "link destination"
+                    String ref = dest.substring(autorefScheme.length());
+                    int refPos = sourcePosToTreePos(getRefPos(ref, link));
+                    var newRefTree = m.at(refPos).newReferenceTree(ref).setEndPos(refPos + ref.length());
+
+                    Node child = link.getFirstChild();
+                    DocTree.Kind linkKind = child.getNext() == null
+                            && child instanceof Text t
+                            && t.getLiteral().equals(ref) ? DocTree.Kind.LINK : DocTree.Kind.LINK_PLAIN;
+
+                    DCTree newLinkTree = linkKind == DocTree.Kind.LINK
+                            ? m.at(NOPOS).newLinkTree(newRefTree, List.of()) // ignore the child trees
+                            : m.at(NOPOS).newLinkPlainTree(newRefTree, trees);
+
+                    saveTrees.add(newLinkTree);
+                } finally {
+                    // start any subsequent copy after the end of the link node
+                    copyStartPos = getEndPos(link);
+                    trees = saveTrees;
+                }
+            } else {
+                visitChildren(link);
+            }
+        }
+
+        /**
+         * {@return the position in the source for the reference in a link}
+         * Many syntactic forms may yield a {@code Link} object, so scan the
+         * source looking for a match. Since the reference typically comes
+         * after any text (when they are different), scan the source backwards.
+         *
+         * @param ref the reference to find
+         * @param link the link containing the reference
+         */
+        private int getRefPos(String ref, Link link) {
+            var spans = link.getSourceSpans();
+            var revSpanIter = spans.listIterator(spans.size());
+            while (revSpanIter.hasPrevious()) {
+                var span = revSpanIter.previous();
+                var start = toSourcePos(span.getLineIndex(), span.getColumnIndex());
+                var end = toSourcePos(span.getLineIndex(), span.getColumnIndex() + span.getLength());
+                var s = source.substring(start, end);
+                var index = s.lastIndexOf(ref);
+                if (index != -1) {
+                    return start + index;
+                }
+            }
+            return NOPOS;
+        }
+
+        /**
+         * {@return the position in the original comment for a position in {@code source},
+         * using {@link #replaceAdjustPos}}
+         *
+         * @param pos the position in {@code source}
+         */
+        private int sourcePosToTreePos(int pos) {
+            return pos == NOPOS ? NOPOS : mainStartPos + pos + replaceAdjustPos;
+        }
+
+        /**
+         * Processes a node and any children.
+         *
+         * If the node has children, the children are each visited by
+         * calling their {@code accept} method, and then finally, if this
+         * is the top-level {@code document} node, any pending text is
+         * flushed.
+         *
+         * If the node does not have children, the source spans for
+         * the node are processed instead.
+         *
+         * Note that unlike the default implementation of {@code visitChildren},
+         * the next child is not accessed until after the current child
+         * has been visited.  This allows a child to peek at and possibly remove
+         * any child nodes that may follow it.
+         *
+         * @param node the node whose children should be visited
+         */
+        @Override
+        protected void visitChildren(Node node) {
+            Node child = node.getFirstChild();
+            if (child != null) {
+                while (child != null) {
+                    // defer getting the next child until after this node has
+                    // been processed, in case any following nodes were handled
+                    // by this node, and removed from the document
+                    child.accept(this);
+                    child = child.getNext();
+                }
+                if (node == document) {
+                    // the top level document has no spans of its own, so use the last child
+                    copyTo(getEndPos(document.getLastChild()));
+                }
+            }
+        }
+
+        /**
+         * {@return the start of this node, from the start of the first span}
+         *
+         * @param node the node
+         */
+        private int getStartPos(Node node) {
+            var spans = node.getSourceSpans();
+            var firstSpan = spans.getFirst();
+            return toSourcePos(firstSpan.getLineIndex(), firstSpan.getColumnIndex());
+        }
+
+        /**
+         * {@return the end of this node, from the end of the last span}
+         * The end points to the first character not included in the span.
+         *
+         * @param node the node
+         */
+        private int getEndPos(Node node) {
+            var spans = node.getSourceSpans();
+            var lastSpan = spans.getLast();
+            return toSourcePos(lastSpan.getLineIndex(), lastSpan.getColumnIndex() + lastSpan.getLength());
+        }
+
+        /**
+         * {@return the position in the {@code source} string for a given {@code (line, column}}
+         *
+         * @param lineIndex the line index
+         * @param columnIndex the column index
+         */
+        private int toSourcePos(int lineIndex, int columnIndex) {
+            return sourceLineOffsets[lineIndex] + columnIndex;
+        }
+
+        /**
+         * Copies source text from the saved copy-start position to the given end position
+         * using the saved {@code source}, to the list of {@code trees}.
+         *
+         * @param endPos the end position
+         */
+        private void copyTo(int endPos) {
+            int startPos = copyStartPos;
+            int rawTextStartPos = copyStartPos;
+            int pos;
+            while ((pos = source.indexOf(PLACEHOLDER, startPos)) != -1 && pos < endPos) {
+                text.append(source, startPos, pos);
+                assert replaceIter.hasNext();
+                Object r = replaceIter.next();
+                if (r instanceof DCTree t) {
+                    flushText(rawTextStartPos);
+                    trees.add(t);
+                    replaceAdjustPos += t.getEndPosition() - t.getStartPosition() - 1;
+                    rawTextStartPos = pos + 1;
+                } else if (r.equals(PLACEHOLDER)) {
+                    text.append(PLACEHOLDER);
+                } else {
+                    throw new IllegalStateException(r.getClass().toString());
+                }
+                startPos = pos + 1;
+            }
+            if (startPos < endPos) {
+                text.append(source, startPos, endPos);
+            }
+            flushText(rawTextStartPos);
+        }
+
+        /**
+         * Flushes any text in the {@code text} buffer, by creating a new
+         * Markdown source text node and adding it to the list of trees.
+         */
+        private void flushText(int pos) {
+            if (!text.isEmpty()) {
+                trees.add(m.at(sourcePosToTreePos(pos)).newRawTextTree(DocTree.Kind.MARKDOWN, text.toString()));
+                text.setLength(0);
+            }
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/Extension.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/Extension.java
new file mode 100644
index 00000000000..b0f1ed378f6
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/Extension.java
@@ -0,0 +1,43 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark;
+
+/**
+ * Base interface for a parser/renderer extension.
+ * <p>
+ * Doesn't have any methods itself, but has specific sub interfaces to
+ * configure parser/renderer. This base interface is for convenience, so that a list of extensions can be built and then
+ * used for configuring both the parser and renderer in the same way.
+ */
+public interface Extension {
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableBlock.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableBlock.java
new file mode 100644
index 00000000000..95e6676b137
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableBlock.java
@@ -0,0 +1,41 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables;
+
+import jdk.internal.org.commonmark.node.CustomBlock;
+
+/**
+ * Table block containing a {@link TableHead} and optionally a {@link TableBody}.
+ */
+public class TableBlock extends CustomBlock {
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableBody.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableBody.java
new file mode 100644
index 00000000000..7f0361467d3
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableBody.java
@@ -0,0 +1,41 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables;
+
+import jdk.internal.org.commonmark.node.CustomNode;
+
+/**
+ * Body part of a {@link TableBlock} containing {@link TableRow TableRows}.
+ */
+public class TableBody extends CustomNode {
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableCell.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableCell.java
new file mode 100644
index 00000000000..3613fc2aea1
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableCell.java
@@ -0,0 +1,86 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables;
+
+import jdk.internal.org.commonmark.node.CustomNode;
+
+/**
+ * Table cell of a {@link TableRow} containing inline nodes.
+ */
+public class TableCell extends CustomNode {
+
+    private boolean header;
+    private Alignment alignment;
+    private int width;
+
+    /**
+     * @return whether the cell is a header or not
+     */
+    public boolean isHeader() {
+        return header;
+    }
+
+    public void setHeader(boolean header) {
+        this.header = header;
+    }
+
+    /**
+     * @return the cell alignment or {@code null} if no specific alignment
+     */
+    public Alignment getAlignment() {
+        return alignment;
+    }
+
+    public void setAlignment(Alignment alignment) {
+        this.alignment = alignment;
+    }
+
+    /**
+     * @return the cell width (the number of dash and colon characters in the delimiter row of the table for this column)
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    /**
+     * How the cell is aligned horizontally.
+     */
+    public enum Alignment {
+        LEFT, CENTER, RIGHT
+    }
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableHead.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableHead.java
new file mode 100644
index 00000000000..3cff03071f8
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableHead.java
@@ -0,0 +1,41 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables;
+
+import jdk.internal.org.commonmark.node.CustomNode;
+
+/**
+ * Head part of a {@link TableBlock} containing {@link TableRow TableRows}.
+ */
+public class TableHead extends CustomNode {
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableRow.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableRow.java
new file mode 100644
index 00000000000..b50d6cc0c38
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableRow.java
@@ -0,0 +1,41 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables;
+
+import jdk.internal.org.commonmark.node.CustomNode;
+
+/**
+ * Table row of a {@link TableHead} or {@link TableBody} containing {@link TableCell TableCells}.
+ */
+public class TableRow extends CustomNode {
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TablesExtension.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TablesExtension.java
new file mode 100644
index 00000000000..63cd4f8e2e5
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TablesExtension.java
@@ -0,0 +1,117 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables;
+
+import jdk.internal.org.commonmark.Extension;
+import jdk.internal.org.commonmark.ext.gfm.tables.internal.TableBlockParser;
+import jdk.internal.org.commonmark.ext.gfm.tables.internal.TableHtmlNodeRenderer;
+import jdk.internal.org.commonmark.ext.gfm.tables.internal.TableMarkdownNodeRenderer;
+import jdk.internal.org.commonmark.ext.gfm.tables.internal.TableTextContentNodeRenderer;
+import jdk.internal.org.commonmark.parser.Parser;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+import jdk.internal.org.commonmark.renderer.html.HtmlNodeRendererContext;
+import jdk.internal.org.commonmark.renderer.html.HtmlNodeRendererFactory;
+import jdk.internal.org.commonmark.renderer.html.HtmlRenderer;
+import jdk.internal.org.commonmark.renderer.markdown.MarkdownNodeRendererContext;
+import jdk.internal.org.commonmark.renderer.markdown.MarkdownNodeRendererFactory;
+import jdk.internal.org.commonmark.renderer.markdown.MarkdownRenderer;
+import jdk.internal.org.commonmark.renderer.text.TextContentNodeRendererContext;
+import jdk.internal.org.commonmark.renderer.text.TextContentNodeRendererFactory;
+import jdk.internal.org.commonmark.renderer.text.TextContentRenderer;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * Extension for GFM tables using "|" pipes (GitHub Flavored Markdown).
+ * <p>
+ * Create it with {@link #create()} and then configure it on the builders
+ * ({@link org.commonmark.parser.Parser.Builder#extensions(Iterable)},
+ * {@link HtmlRenderer.Builder#extensions(Iterable)}).
+ * </p>
+ * <p>
+ * The parsed tables are turned into {@link TableBlock} blocks.
+ * </p>
+ *
+ * @see <a href="https://github.github.com/gfm/#tables-extension-">Tables (extension) in GitHub Flavored Markdown Spec</a>
+ */
+public class TablesExtension implements Parser.ParserExtension, HtmlRenderer.HtmlRendererExtension,
+        TextContentRenderer.TextContentRendererExtension, MarkdownRenderer.MarkdownRendererExtension {
+
+    private TablesExtension() {
+    }
+
+    public static Extension create() {
+        return new TablesExtension();
+    }
+
+    @Override
+    public void extend(Parser.Builder parserBuilder) {
+        parserBuilder.customBlockParserFactory(new TableBlockParser.Factory());
+    }
+
+    @Override
+    public void extend(HtmlRenderer.Builder rendererBuilder) {
+        rendererBuilder.nodeRendererFactory(new HtmlNodeRendererFactory() {
+            @Override
+            public NodeRenderer create(HtmlNodeRendererContext context) {
+                return new TableHtmlNodeRenderer(context);
+            }
+        });
+    }
+
+    @Override
+    public void extend(TextContentRenderer.Builder rendererBuilder) {
+        rendererBuilder.nodeRendererFactory(new TextContentNodeRendererFactory() {
+            @Override
+            public NodeRenderer create(TextContentNodeRendererContext context) {
+                return new TableTextContentNodeRenderer(context);
+            }
+        });
+    }
+
+    @Override
+    public void extend(MarkdownRenderer.Builder rendererBuilder) {
+        rendererBuilder.nodeRendererFactory(new MarkdownNodeRendererFactory() {
+            @Override
+            public NodeRenderer create(MarkdownNodeRendererContext context) {
+                return new TableMarkdownNodeRenderer(context);
+            }
+
+            @Override
+            public Set<Character> getSpecialCharacters() {
+                return Collections.singleton('|');
+            }
+        });
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableBlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableBlockParser.java
new file mode 100644
index 00000000000..aca4db8fc1c
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableBlockParser.java
@@ -0,0 +1,344 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables.internal;
+
+import jdk.internal.org.commonmark.ext.gfm.tables.*;
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.node.SourceSpan;
+import jdk.internal.org.commonmark.parser.InlineParser;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.SourceLines;
+import jdk.internal.org.commonmark.parser.block.*;
+import jdk.internal.org.commonmark.text.Characters;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TableBlockParser extends AbstractBlockParser {
+
+    private final TableBlock block = new TableBlock();
+    private final List<SourceLine> rowLines = new ArrayList<>();
+    private final List<TableCellInfo> columns;
+
+    private boolean canHaveLazyContinuationLines = true;
+
+    private TableBlockParser(List<TableCellInfo> columns, SourceLine headerLine) {
+        this.columns = columns;
+        this.rowLines.add(headerLine);
+    }
+
+    @Override
+    public boolean canHaveLazyContinuationLines() {
+        return canHaveLazyContinuationLines;
+    }
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        CharSequence content = state.getLine().getContent();
+        int pipe = Characters.find('|', content, state.getNextNonSpaceIndex());
+        if (pipe != -1) {
+            if (pipe == state.getNextNonSpaceIndex()) {
+                // If we *only* have a pipe character (and whitespace), that is not a valid table row and ends the table.
+                if (Characters.skipSpaceTab(content, pipe + 1, content.length()) == content.length()) {
+                    // We also don't want the pipe to be added via lazy continuation.
+                    canHaveLazyContinuationLines = false;
+                    return BlockContinue.none();
+                }
+            }
+            return BlockContinue.atIndex(state.getIndex());
+        } else {
+            return BlockContinue.none();
+        }
+    }
+
+    @Override
+    public void addLine(SourceLine line) {
+        rowLines.add(line);
+    }
+
+    @Override
+    public void parseInlines(InlineParser inlineParser) {
+        List<SourceSpan> sourceSpans = block.getSourceSpans();
+
+        SourceSpan headerSourceSpan = !sourceSpans.isEmpty() ? sourceSpans.get(0) : null;
+        Node head = new TableHead();
+        if (headerSourceSpan != null) {
+            head.addSourceSpan(headerSourceSpan);
+        }
+        block.appendChild(head);
+
+        TableRow headerRow = new TableRow();
+        headerRow.setSourceSpans(head.getSourceSpans());
+        head.appendChild(headerRow);
+
+        List<SourceLine> headerCells = split(rowLines.get(0));
+        int headerColumns = headerCells.size();
+        for (int i = 0; i < headerColumns; i++) {
+            SourceLine cell = headerCells.get(i);
+            TableCell tableCell = parseCell(cell, i, inlineParser);
+            tableCell.setHeader(true);
+            headerRow.appendChild(tableCell);
+        }
+
+        TableBody body = null;
+        // Body starts at index 2. 0 is header, 1 is separator.
+        for (int rowIndex = 2; rowIndex < rowLines.size(); rowIndex++) {
+            SourceLine rowLine = rowLines.get(rowIndex);
+            SourceSpan sourceSpan = rowIndex < sourceSpans.size() ? sourceSpans.get(rowIndex) : null;
+            List<SourceLine> cells = split(rowLine);
+            TableRow row = new TableRow();
+            if (sourceSpan != null) {
+                row.addSourceSpan(sourceSpan);
+            }
+
+            // Body can not have more columns than head
+            for (int i = 0; i < headerColumns; i++) {
+                SourceLine cell = i < cells.size() ? cells.get(i) : SourceLine.of("", null);
+                TableCell tableCell = parseCell(cell, i, inlineParser);
+                row.appendChild(tableCell);
+            }
+
+            if (body == null) {
+                // It's valid to have a table without body. In that case, don't add an empty TableBody node.
+                body = new TableBody();
+                block.appendChild(body);
+            }
+            body.appendChild(row);
+            body.addSourceSpan(sourceSpan);
+        }
+    }
+
+    private TableCell parseCell(SourceLine cell, int column, InlineParser inlineParser) {
+        TableCell tableCell = new TableCell();
+        SourceSpan sourceSpan = cell.getSourceSpan();
+        if (sourceSpan != null) {
+            tableCell.addSourceSpan(sourceSpan);
+        }
+
+        if (column < columns.size()) {
+            TableCellInfo cellInfo = columns.get(column);
+            tableCell.setAlignment(cellInfo.getAlignment());
+            tableCell.setWidth(cellInfo.getWidth());
+        }
+
+        CharSequence content = cell.getContent();
+        int start = Characters.skipSpaceTab(content, 0, content.length());
+        int end = Characters.skipSpaceTabBackwards(content, content.length() - 1, start);
+        inlineParser.parse(SourceLines.of(cell.substring(start, end + 1)), tableCell);
+
+        return tableCell;
+    }
+
+    private static List<SourceLine> split(SourceLine line) {
+        CharSequence row = line.getContent();
+        int nonSpace = Characters.skipSpaceTab(row, 0, row.length());
+        int cellStart = nonSpace;
+        int cellEnd = row.length();
+        if (row.charAt(nonSpace) == '|') {
+            // This row has leading/trailing pipes - skip the leading pipe
+            cellStart = nonSpace + 1;
+            // Strip whitespace from the end but not the pipe or we could miss an empty ("||") cell
+            int nonSpaceEnd = Characters.skipSpaceTabBackwards(row, row.length() - 1, cellStart);
+            cellEnd = nonSpaceEnd + 1;
+        }
+        List<SourceLine> cells = new ArrayList<>();
+        StringBuilder sb = new StringBuilder();
+        for (int i = cellStart; i < cellEnd; i++) {
+            char c = row.charAt(i);
+            switch (c) {
+                case '\\':
+                    if (i + 1 < cellEnd && row.charAt(i + 1) == '|') {
+                        // Pipe is special for table parsing. An escaped pipe doesn't result in a new cell, but is
+                        // passed down to inline parsing as an unescaped pipe. Note that that applies even for the `\|`
+                        // in an input like `\\|` - in other words, table parsing doesn't support escaping backslashes.
+                        sb.append('|');
+                        i++;
+                    } else {
+                        // Preserve backslash before other characters or at end of line.
+                        sb.append('\\');
+                    }
+                    break;
+                case '|':
+                    String content = sb.toString();
+
+                    cells.add(SourceLine.of(content, line.substring(cellStart, i).getSourceSpan()));
+                    sb.setLength(0);
+                    // + 1 to skip the pipe itself for the next cell's span
+                    cellStart = i + 1;
+                    break;
+                default:
+                    sb.append(c);
+            }
+        }
+        if (sb.length() > 0) {
+            String content = sb.toString();
+            cells.add(SourceLine.of(content, line.substring(cellStart, line.getContent().length()).getSourceSpan()));
+        }
+        return cells;
+    }
+
+    // Examples of valid separators:
+    //
+    // |-
+    // -|
+    // |-|
+    // -|-
+    // |-|-|
+    // --- | ---
+    private static List<TableCellInfo> parseSeparator(CharSequence s) {
+        List<TableCellInfo> columns = new ArrayList<>();
+        int pipes = 0;
+        boolean valid = false;
+        int i = 0;
+        int width = 0;
+        while (i < s.length()) {
+            char c = s.charAt(i);
+            switch (c) {
+                case '|':
+                    i++;
+                    pipes++;
+                    if (pipes > 1) {
+                        // More than one adjacent pipe not allowed
+                        return null;
+                    }
+                    // Need at lest one pipe, even for a one column table
+                    valid = true;
+                    break;
+                case '-':
+                case ':':
+                    if (pipes == 0 && !columns.isEmpty()) {
+                        // Need a pipe after the first column (first column doesn't need to start with one)
+                        return null;
+                    }
+                    boolean left = false;
+                    boolean right = false;
+                    if (c == ':') {
+                        left = true;
+                        i++;
+                        width++;
+                    }
+                    boolean haveDash = false;
+                    while (i < s.length() && s.charAt(i) == '-') {
+                        i++;
+                        width++;
+                        haveDash = true;
+                    }
+                    if (!haveDash) {
+                        // Need at least one dash
+                        return null;
+                    }
+                    if (i < s.length() && s.charAt(i) == ':') {
+                        right = true;
+                        i++;
+                        width++;
+                    }
+                    columns.add(new TableCellInfo(getAlignment(left, right), width));
+                    width = 0;
+                    // Next, need another pipe
+                    pipes = 0;
+                    break;
+                case ' ':
+                case '\t':
+                    // White space is allowed between pipes and columns
+                    i++;
+                    break;
+                default:
+                    // Any other character is invalid
+                    return null;
+            }
+        }
+        if (!valid) {
+            return null;
+        }
+        return columns;
+    }
+
+    private static TableCell.Alignment getAlignment(boolean left, boolean right) {
+        if (left && right) {
+            return TableCell.Alignment.CENTER;
+        } else if (left) {
+            return TableCell.Alignment.LEFT;
+        } else if (right) {
+            return TableCell.Alignment.RIGHT;
+        } else {
+            return null;
+        }
+    }
+
+    public static class Factory extends AbstractBlockParserFactory {
+
+        @Override
+        public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
+            List<SourceLine> paragraphLines = matchedBlockParser.getParagraphLines().getLines();
+            if (paragraphLines.size() == 1 && Characters.find('|', paragraphLines.get(0).getContent(), 0) != -1) {
+                SourceLine line = state.getLine();
+                SourceLine separatorLine = line.substring(state.getIndex(), line.getContent().length());
+                List<TableCellInfo> columns = parseSeparator(separatorLine.getContent());
+                if (columns != null && !columns.isEmpty()) {
+                    SourceLine paragraph = paragraphLines.get(0);
+                    List<SourceLine> headerCells = split(paragraph);
+                    if (columns.size() >= headerCells.size()) {
+                        return BlockStart.of(new TableBlockParser(columns, paragraph))
+                                .atIndex(state.getIndex())
+                                .replaceActiveBlockParser();
+                    }
+                }
+            }
+            return BlockStart.none();
+        }
+    }
+
+    private static class TableCellInfo {
+        private final TableCell.Alignment alignment;
+        private final int width;
+
+        public TableCell.Alignment getAlignment() {
+            return alignment;
+        }
+
+        public int getWidth() {
+            return width;
+        }
+
+        public TableCellInfo(TableCell.Alignment alignment, int width) {
+            this.alignment = alignment;
+            this.width = width;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableHtmlNodeRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableHtmlNodeRenderer.java
new file mode 100644
index 00000000000..7c9f74fec43
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableHtmlNodeRenderer.java
@@ -0,0 +1,126 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables.internal;
+
+import jdk.internal.org.commonmark.ext.gfm.tables.*;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.renderer.html.HtmlNodeRendererContext;
+import jdk.internal.org.commonmark.renderer.html.HtmlWriter;
+
+import java.util.Collections;
+import java.util.Map;
+
+public class TableHtmlNodeRenderer extends TableNodeRenderer {
+
+    private final HtmlWriter htmlWriter;
+    private final HtmlNodeRendererContext context;
+
+    public TableHtmlNodeRenderer(HtmlNodeRendererContext context) {
+        this.htmlWriter = context.getWriter();
+        this.context = context;
+    }
+
+    protected void renderBlock(TableBlock tableBlock) {
+        htmlWriter.line();
+        htmlWriter.tag("table", getAttributes(tableBlock, "table"));
+        renderChildren(tableBlock);
+        htmlWriter.tag("/table");
+        htmlWriter.line();
+    }
+
+    protected void renderHead(TableHead tableHead) {
+        htmlWriter.line();
+        htmlWriter.tag("thead", getAttributes(tableHead, "thead"));
+        renderChildren(tableHead);
+        htmlWriter.tag("/thead");
+        htmlWriter.line();
+    }
+
+    protected void renderBody(TableBody tableBody) {
+        htmlWriter.line();
+        htmlWriter.tag("tbody", getAttributes(tableBody, "tbody"));
+        renderChildren(tableBody);
+        htmlWriter.tag("/tbody");
+        htmlWriter.line();
+    }
+
+    protected void renderRow(TableRow tableRow) {
+        htmlWriter.line();
+        htmlWriter.tag("tr", getAttributes(tableRow, "tr"));
+        renderChildren(tableRow);
+        htmlWriter.tag("/tr");
+        htmlWriter.line();
+    }
+
+    protected void renderCell(TableCell tableCell) {
+        String tagName = tableCell.isHeader() ? "th" : "td";
+        htmlWriter.line();
+        htmlWriter.tag(tagName, getCellAttributes(tableCell, tagName));
+        renderChildren(tableCell);
+        htmlWriter.tag("/" + tagName);
+        htmlWriter.line();
+    }
+
+    private Map<String, String> getAttributes(Node node, String tagName) {
+        return context.extendAttributes(node, tagName, Collections.<String, String>emptyMap());
+    }
+
+    private Map<String, String> getCellAttributes(TableCell tableCell, String tagName) {
+        if (tableCell.getAlignment() != null) {
+            return context.extendAttributes(tableCell, tagName, Collections.singletonMap("align", getAlignValue(tableCell.getAlignment())));
+        } else {
+            return context.extendAttributes(tableCell, tagName, Collections.<String, String>emptyMap());
+        }
+    }
+
+    private static String getAlignValue(TableCell.Alignment alignment) {
+        switch (alignment) {
+            case LEFT:
+                return "left";
+            case CENTER:
+                return "center";
+            case RIGHT:
+                return "right";
+        }
+        throw new IllegalStateException("Unknown alignment: " + alignment);
+    }
+
+    private void renderChildren(Node parent) {
+        Node node = parent.getFirstChild();
+        while (node != null) {
+            Node next = node.getNext();
+            context.render(node);
+            node = next;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableMarkdownNodeRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableMarkdownNodeRenderer.java
new file mode 100644
index 00000000000..00712579a5b
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableMarkdownNodeRenderer.java
@@ -0,0 +1,121 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables.internal;
+
+import jdk.internal.org.commonmark.ext.gfm.tables.*;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+import jdk.internal.org.commonmark.renderer.markdown.MarkdownNodeRendererContext;
+import jdk.internal.org.commonmark.renderer.markdown.MarkdownWriter;
+import jdk.internal.org.commonmark.text.AsciiMatcher;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The Table node renderer that is needed for rendering GFM tables (GitHub Flavored Markdown) to text content.
+ */
+public class TableMarkdownNodeRenderer extends TableNodeRenderer implements NodeRenderer {
+    private final MarkdownWriter writer;
+    private final MarkdownNodeRendererContext context;
+
+    private final AsciiMatcher pipe = AsciiMatcher.builder().c('|').build();
+
+    private final List<TableCell.Alignment> columns = new ArrayList<>();
+
+    public TableMarkdownNodeRenderer(MarkdownNodeRendererContext context) {
+        this.writer = context.getWriter();
+        this.context = context;
+    }
+
+    @Override
+    protected void renderBlock(TableBlock node) {
+        columns.clear();
+        writer.pushTight(true);
+        renderChildren(node);
+        writer.popTight();
+        writer.block();
+    }
+
+    @Override
+    protected void renderHead(TableHead node) {
+        renderChildren(node);
+        for (TableCell.Alignment columnAlignment : columns) {
+            writer.raw('|');
+            if (columnAlignment == TableCell.Alignment.LEFT) {
+                writer.raw(":---");
+            } else if (columnAlignment == TableCell.Alignment.RIGHT) {
+                writer.raw("---:");
+            } else if (columnAlignment == TableCell.Alignment.CENTER) {
+                writer.raw(":---:");
+            } else {
+                writer.raw("---");
+            }
+        }
+        writer.raw("|");
+        writer.block();
+    }
+
+    @Override
+    protected void renderBody(TableBody node) {
+        renderChildren(node);
+    }
+
+    @Override
+    protected void renderRow(TableRow node) {
+        renderChildren(node);
+        // Trailing | at the end of the line
+        writer.raw("|");
+        writer.block();
+    }
+
+    @Override
+    protected void renderCell(TableCell node) {
+        if (node.getParent() != null && node.getParent().getParent() instanceof TableHead) {
+            columns.add(node.getAlignment());
+        }
+        writer.raw("|");
+        writer.pushRawEscape(pipe);
+        renderChildren(node);
+        writer.popRawEscape();
+    }
+
+    private void renderChildren(Node parent) {
+        Node node = parent.getFirstChild();
+        while (node != null) {
+            Node next = node.getNext();
+            context.render(node);
+            node = next;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableNodeRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableNodeRenderer.java
new file mode 100644
index 00000000000..c7b6beabb0d
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableNodeRenderer.java
@@ -0,0 +1,84 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables.internal;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import jdk.internal.org.commonmark.ext.gfm.tables.TableBlock;
+import jdk.internal.org.commonmark.ext.gfm.tables.TableBody;
+import jdk.internal.org.commonmark.ext.gfm.tables.TableCell;
+import jdk.internal.org.commonmark.ext.gfm.tables.TableHead;
+import jdk.internal.org.commonmark.ext.gfm.tables.TableRow;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+
+abstract class TableNodeRenderer implements NodeRenderer {
+
+    @Override
+    public Set<Class<? extends Node>> getNodeTypes() {
+        return new HashSet<>(Arrays.asList(
+                TableBlock.class,
+                TableHead.class,
+                TableBody.class,
+                TableRow.class,
+                TableCell.class
+        ));
+    }
+
+    @Override
+    public void render(Node node) {
+        if (node instanceof TableBlock) {
+            renderBlock((TableBlock) node);
+        } else if (node instanceof TableHead) {
+            renderHead((TableHead) node);
+        } else if (node instanceof TableBody) {
+            renderBody((TableBody) node);
+        } else if (node instanceof TableRow) {
+            renderRow((TableRow) node);
+        } else if (node instanceof TableCell) {
+            renderCell((TableCell) node);
+        }
+    }
+
+    protected abstract void renderBlock(TableBlock node);
+
+    protected abstract void renderHead(TableHead node);
+
+    protected abstract void renderBody(TableBody node);
+
+    protected abstract void renderRow(TableRow node);
+
+    protected abstract void renderCell(TableCell node);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableTextContentNodeRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableTextContentNodeRenderer.java
new file mode 100644
index 00000000000..3b618474bce
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableTextContentNodeRenderer.java
@@ -0,0 +1,103 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables.internal;
+
+import jdk.internal.org.commonmark.ext.gfm.tables.TableBlock;
+import jdk.internal.org.commonmark.ext.gfm.tables.TableBody;
+import jdk.internal.org.commonmark.ext.gfm.tables.TableCell;
+import jdk.internal.org.commonmark.ext.gfm.tables.TableHead;
+import jdk.internal.org.commonmark.ext.gfm.tables.TableRow;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.renderer.text.TextContentNodeRendererContext;
+import jdk.internal.org.commonmark.renderer.text.TextContentWriter;
+
+/**
+ * The Table node renderer that is needed for rendering GFM tables (GitHub Flavored Markdown) to text content.
+ */
+public class TableTextContentNodeRenderer extends TableNodeRenderer {
+
+    private final TextContentWriter textContentWriter;
+    private final TextContentNodeRendererContext context;
+
+    public TableTextContentNodeRenderer(TextContentNodeRendererContext context) {
+        this.textContentWriter = context.getWriter();
+        this.context = context;
+    }
+
+    protected void renderBlock(TableBlock tableBlock) {
+        renderChildren(tableBlock);
+        if (tableBlock.getNext() != null) {
+            textContentWriter.write("\n");
+        }
+    }
+
+    protected void renderHead(TableHead tableHead) {
+        renderChildren(tableHead);
+    }
+
+    protected void renderBody(TableBody tableBody) {
+        renderChildren(tableBody);
+    }
+
+    protected void renderRow(TableRow tableRow) {
+        textContentWriter.line();
+        renderChildren(tableRow);
+        textContentWriter.line();
+    }
+
+    protected void renderCell(TableCell tableCell) {
+        renderChildren(tableCell);
+        textContentWriter.write('|');
+        textContentWriter.whitespace();
+    }
+
+    private void renderLastCell(TableCell tableCell) {
+        renderChildren(tableCell);
+    }
+
+    private void renderChildren(Node parent) {
+        Node node = parent.getFirstChild();
+        while (node != null) {
+            Node next = node.getNext();
+
+            // For last cell in row, we dont render the delimiter.
+            if (node instanceof TableCell && next == null) {
+                renderLastCell((TableCell) node);
+            } else {
+                context.render(node);
+            }
+
+            node = next;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockContent.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockContent.java
new file mode 100644
index 00000000000..64e9e5f7bf1
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockContent.java
@@ -0,0 +1,61 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+class BlockContent {
+
+    private final StringBuilder sb;
+
+    private int lineCount = 0;
+
+    public BlockContent() {
+        sb = new StringBuilder();
+    }
+
+    public BlockContent(String content) {
+        sb = new StringBuilder(content);
+    }
+
+    public void add(CharSequence line) {
+        if (lineCount != 0) {
+            sb.append('\n');
+        }
+        sb.append(line);
+        lineCount++;
+    }
+
+    public String getString() {
+        return sb.toString();
+    }
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockContinueImpl.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockContinueImpl.java
new file mode 100644
index 00000000000..47697018e40
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockContinueImpl.java
@@ -0,0 +1,61 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.parser.block.BlockContinue;
+
+public class BlockContinueImpl extends BlockContinue {
+
+    private final int newIndex;
+    private final int newColumn;
+    private final boolean finalize;
+
+    public BlockContinueImpl(int newIndex, int newColumn, boolean finalize) {
+        this.newIndex = newIndex;
+        this.newColumn = newColumn;
+        this.finalize = finalize;
+    }
+
+    public int getNewIndex() {
+        return newIndex;
+    }
+
+    public int getNewColumn() {
+        return newColumn;
+    }
+
+    public boolean isFinalize() {
+        return finalize;
+    }
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockQuoteParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockQuoteParser.java
new file mode 100644
index 00000000000..db6f81976b4
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockQuoteParser.java
@@ -0,0 +1,95 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.util.Parsing;
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.BlockQuote;
+import jdk.internal.org.commonmark.parser.block.*;
+import jdk.internal.org.commonmark.text.Characters;
+
+public class BlockQuoteParser extends AbstractBlockParser {
+
+    private final BlockQuote block = new BlockQuote();
+
+    @Override
+    public boolean isContainer() {
+        return true;
+    }
+
+    @Override
+    public boolean canContain(Block block) {
+        return true;
+    }
+
+    @Override
+    public BlockQuote getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        int nextNonSpace = state.getNextNonSpaceIndex();
+        if (isMarker(state, nextNonSpace)) {
+            int newColumn = state.getColumn() + state.getIndent() + 1;
+            // optional following space or tab
+            if (Characters.isSpaceOrTab(state.getLine().getContent(), nextNonSpace + 1)) {
+                newColumn++;
+            }
+            return BlockContinue.atColumn(newColumn);
+        } else {
+            return BlockContinue.none();
+        }
+    }
+
+    private static boolean isMarker(ParserState state, int index) {
+        CharSequence line = state.getLine().getContent();
+        return state.getIndent() < Parsing.CODE_BLOCK_INDENT && index < line.length() && line.charAt(index) == '>';
+    }
+
+    public static class Factory extends AbstractBlockParserFactory {
+        public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
+            int nextNonSpace = state.getNextNonSpaceIndex();
+            if (isMarker(state, nextNonSpace)) {
+                int newColumn = state.getColumn() + state.getIndent() + 1;
+                // optional following space or tab
+                if (Characters.isSpaceOrTab(state.getLine().getContent(), nextNonSpace + 1)) {
+                    newColumn++;
+                }
+                return BlockStart.of(new BlockQuoteParser()).atColumn(newColumn);
+            } else {
+                return BlockStart.none();
+            }
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockStartImpl.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockStartImpl.java
new file mode 100644
index 00000000000..bde28136b82
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockStartImpl.java
@@ -0,0 +1,83 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.parser.block.BlockParser;
+import jdk.internal.org.commonmark.parser.block.BlockStart;
+
+public class BlockStartImpl extends BlockStart {
+
+    private final BlockParser[] blockParsers;
+    private int newIndex = -1;
+    private int newColumn = -1;
+    private boolean replaceActiveBlockParser = false;
+
+    public BlockStartImpl(BlockParser... blockParsers) {
+        this.blockParsers = blockParsers;
+    }
+
+    public BlockParser[] getBlockParsers() {
+        return blockParsers;
+    }
+
+    public int getNewIndex() {
+        return newIndex;
+    }
+
+    public int getNewColumn() {
+        return newColumn;
+    }
+
+    public boolean isReplaceActiveBlockParser() {
+        return replaceActiveBlockParser;
+    }
+
+    @Override
+    public BlockStart atIndex(int newIndex) {
+        this.newIndex = newIndex;
+        return this;
+    }
+
+    @Override
+    public BlockStart atColumn(int newColumn) {
+        this.newColumn = newColumn;
+        return this;
+    }
+
+    @Override
+    public BlockStart replaceActiveBlockParser() {
+        this.replaceActiveBlockParser = true;
+        return this;
+    }
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/Bracket.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/Bracket.java
new file mode 100644
index 00000000000..373d3ac1663
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/Bracket.java
@@ -0,0 +1,96 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.node.Text;
+import jdk.internal.org.commonmark.parser.beta.Position;
+
+/**
+ * Opening bracket for links (<code>[</code>) or images (<code>![</code>).
+ */
+public class Bracket {
+
+    public final Text node;
+
+    /**
+     * The position of the marker for the bracket (<code>[</code> or <code>![</code>)
+     */
+    public final Position markerPosition;
+
+    /**
+     * The position of the content (after the opening bracket)
+     */
+    public final Position contentPosition;
+
+    /**
+     * Whether this is an image or link.
+     */
+    public final boolean image;
+
+    /**
+     * Previous bracket.
+     */
+    public final Bracket previous;
+
+    /**
+     * Previous delimiter (emphasis, etc) before this bracket.
+     */
+    public final Delimiter previousDelimiter;
+
+    /**
+     * Whether this bracket is allowed to form a link/image (also known as "active").
+     */
+    public boolean allowed = true;
+
+    /**
+     * Whether there is an unescaped bracket (opening or closing) anywhere after this opening bracket.
+     */
+    public boolean bracketAfter = false;
+
+    static public Bracket link(Text node, Position markerPosition, Position contentPosition, Bracket previous, Delimiter previousDelimiter) {
+        return new Bracket(node, markerPosition, contentPosition, previous, previousDelimiter, false);
+    }
+
+    static public Bracket image(Text node, Position markerPosition, Position contentPosition, Bracket previous, Delimiter previousDelimiter) {
+        return new Bracket(node, markerPosition, contentPosition, previous, previousDelimiter, true);
+    }
+
+    private Bracket(Text node, Position markerPosition, Position contentPosition, Bracket previous, Delimiter previousDelimiter, boolean image) {
+        this.node = node;
+        this.markerPosition = markerPosition;
+        this.contentPosition = contentPosition;
+        this.image = image;
+        this.previous = previous;
+        this.previousDelimiter = previousDelimiter;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/Delimiter.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/Delimiter.java
new file mode 100644
index 00000000000..8437594dd6d
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/Delimiter.java
@@ -0,0 +1,114 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.node.Text;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterRun;
+
+import java.util.List;
+
+/**
+ * Delimiter (emphasis, strong emphasis or custom emphasis).
+ */
+public class Delimiter implements DelimiterRun {
+
+    public final List<Text> characters;
+    public final char delimiterChar;
+    private final int originalLength;
+
+    // Can open emphasis, see spec.
+    private final boolean canOpen;
+
+    // Can close emphasis, see spec.
+    private final boolean canClose;
+
+    public Delimiter previous;
+    public Delimiter next;
+
+    public Delimiter(List<Text> characters, char delimiterChar, boolean canOpen, boolean canClose, Delimiter previous) {
+        this.characters = characters;
+        this.delimiterChar = delimiterChar;
+        this.canOpen = canOpen;
+        this.canClose = canClose;
+        this.previous = previous;
+        this.originalLength = characters.size();
+    }
+
+    @Override
+    public boolean canOpen() {
+        return canOpen;
+    }
+
+    @Override
+    public boolean canClose() {
+        return canClose;
+    }
+
+    @Override
+    public int length() {
+        return characters.size();
+    }
+
+    @Override
+    public int originalLength() {
+        return originalLength;
+    }
+
+    @Override
+    public Text getOpener() {
+        return characters.get(characters.size() - 1);
+    }
+
+    @Override
+    public Text getCloser() {
+        return characters.get(0);
+    }
+
+    @Override
+    public Iterable<Text> getOpeners(int length) {
+        if (!(length >= 1 && length <= length())) {
+            throw new IllegalArgumentException("length must be between 1 and " + length() + ", was " + length);
+        }
+
+        return characters.subList(characters.size() - length, characters.size());
+    }
+
+    @Override
+    public Iterable<Text> getClosers(int length) {
+        if (!(length >= 1 && length <= length())) {
+            throw new IllegalArgumentException("length must be between 1 and " + length() + ", was " + length);
+        }
+
+        return characters.subList(0, length);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/DocumentBlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/DocumentBlockParser.java
new file mode 100644
index 00000000000..8f18feed1a0
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/DocumentBlockParser.java
@@ -0,0 +1,70 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.Document;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.block.AbstractBlockParser;
+import jdk.internal.org.commonmark.parser.block.BlockContinue;
+import jdk.internal.org.commonmark.parser.block.ParserState;
+
+public class DocumentBlockParser extends AbstractBlockParser {
+
+    private final Document document = new Document();
+
+    @Override
+    public boolean isContainer() {
+        return true;
+    }
+
+    @Override
+    public boolean canContain(Block block) {
+        return true;
+    }
+
+    @Override
+    public Document getBlock() {
+        return document;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        return BlockContinue.atIndex(state.getIndex());
+    }
+
+    @Override
+    public void addLine(SourceLine line) {
+    }
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/DocumentParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/DocumentParser.java
new file mode 100644
index 00000000000..34ac293d891
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/DocumentParser.java
@@ -0,0 +1,639 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.util.Parsing;
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.parser.*;
+import jdk.internal.org.commonmark.parser.block.*;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterProcessor;
+import jdk.internal.org.commonmark.text.Characters;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.*;
+
+public class DocumentParser implements ParserState {
+
+    private static final Set<Class<? extends Block>> CORE_FACTORY_TYPES = new LinkedHashSet<>(Arrays.asList(
+            BlockQuote.class,
+            Heading.class,
+            FencedCodeBlock.class,
+            HtmlBlock.class,
+            ThematicBreak.class,
+            ListBlock.class,
+            IndentedCodeBlock.class));
+
+    private static final Map<Class<? extends Block>, BlockParserFactory> NODES_TO_CORE_FACTORIES;
+
+    static {
+        Map<Class<? extends Block>, BlockParserFactory> map = new HashMap<>();
+        map.put(BlockQuote.class, new BlockQuoteParser.Factory());
+        map.put(Heading.class, new HeadingParser.Factory());
+        map.put(FencedCodeBlock.class, new FencedCodeBlockParser.Factory());
+        map.put(HtmlBlock.class, new HtmlBlockParser.Factory());
+        map.put(ThematicBreak.class, new ThematicBreakParser.Factory());
+        map.put(ListBlock.class, new ListBlockParser.Factory());
+        map.put(IndentedCodeBlock.class, new IndentedCodeBlockParser.Factory());
+        NODES_TO_CORE_FACTORIES = Collections.unmodifiableMap(map);
+    }
+
+    private SourceLine line;
+
+    /**
+     * Line index (0-based)
+     */
+    private int lineIndex = -1;
+
+    /**
+     * current index (offset) in input line (0-based)
+     */
+    private int index = 0;
+
+    /**
+     * current column of input line (tab causes column to go to next 4-space tab stop) (0-based)
+     */
+    private int column = 0;
+
+    /**
+     * if the current column is within a tab character (partially consumed tab)
+     */
+    private boolean columnIsInTab;
+
+    private int nextNonSpace = 0;
+    private int nextNonSpaceColumn = 0;
+    private int indent = 0;
+    private boolean blank;
+
+    private final List<BlockParserFactory> blockParserFactories;
+    private final InlineParserFactory inlineParserFactory;
+    private final List<DelimiterProcessor> delimiterProcessors;
+    private final IncludeSourceSpans includeSourceSpans;
+    private final DocumentBlockParser documentBlockParser;
+    private final LinkReferenceDefinitions definitions = new LinkReferenceDefinitions();
+
+    private final List<OpenBlockParser> openBlockParsers = new ArrayList<>();
+    private final List<BlockParser> allBlockParsers = new ArrayList<>();
+
+    public DocumentParser(List<BlockParserFactory> blockParserFactories, InlineParserFactory inlineParserFactory,
+                          List<DelimiterProcessor> delimiterProcessors, IncludeSourceSpans includeSourceSpans) {
+        this.blockParserFactories = blockParserFactories;
+        this.inlineParserFactory = inlineParserFactory;
+        this.delimiterProcessors = delimiterProcessors;
+        this.includeSourceSpans = includeSourceSpans;
+
+        this.documentBlockParser = new DocumentBlockParser();
+        activateBlockParser(new OpenBlockParser(documentBlockParser, 0));
+    }
+
+    public static Set<Class<? extends Block>> getDefaultBlockParserTypes() {
+        return CORE_FACTORY_TYPES;
+    }
+
+    public static List<BlockParserFactory> calculateBlockParserFactories(List<BlockParserFactory> customBlockParserFactories, Set<Class<? extends Block>> enabledBlockTypes) {
+        List<BlockParserFactory> list = new ArrayList<>();
+        // By having the custom factories come first, extensions are able to change behavior of core syntax.
+        list.addAll(customBlockParserFactories);
+        for (Class<? extends Block> blockType : enabledBlockTypes) {
+            list.add(NODES_TO_CORE_FACTORIES.get(blockType));
+        }
+        return list;
+    }
+
+    public static void checkEnabledBlockTypes(Set<Class<? extends Block>> enabledBlockTypes) {
+        for (Class<? extends Block> enabledBlockType : enabledBlockTypes) {
+            if (!NODES_TO_CORE_FACTORIES.containsKey(enabledBlockType)) {
+                throw new IllegalArgumentException("Can't enable block type " + enabledBlockType + ", possible options are: " + NODES_TO_CORE_FACTORIES.keySet());
+            }
+        }
+    }
+
+    /**
+     * The main parsing function. Returns a parsed document AST.
+     */
+    public Document parse(String input) {
+        int lineStart = 0;
+        int lineBreak;
+        while ((lineBreak = Characters.findLineBreak(input, lineStart)) != -1) {
+            String line = input.substring(lineStart, lineBreak);
+            parseLine(line);
+            if (lineBreak + 1 < input.length() && input.charAt(lineBreak) == '\r' && input.charAt(lineBreak + 1) == '\n') {
+                lineStart = lineBreak + 2;
+            } else {
+                lineStart = lineBreak + 1;
+            }
+        }
+        if (input.length() > 0 && (lineStart == 0 || lineStart < input.length())) {
+            String line = input.substring(lineStart);
+            parseLine(line);
+        }
+
+        return finalizeAndProcess();
+    }
+
+    public Document parse(Reader input) throws IOException {
+        BufferedReader bufferedReader;
+        if (input instanceof BufferedReader) {
+            bufferedReader = (BufferedReader) input;
+        } else {
+            bufferedReader = new BufferedReader(input);
+        }
+
+        String line;
+        while ((line = bufferedReader.readLine()) != null) {
+            parseLine(line);
+        }
+
+        return finalizeAndProcess();
+    }
+
+    @Override
+    public SourceLine getLine() {
+        return line;
+    }
+
+    @Override
+    public int getIndex() {
+        return index;
+    }
+
+    @Override
+    public int getNextNonSpaceIndex() {
+        return nextNonSpace;
+    }
+
+    @Override
+    public int getColumn() {
+        return column;
+    }
+
+    @Override
+    public int getIndent() {
+        return indent;
+    }
+
+    @Override
+    public boolean isBlank() {
+        return blank;
+    }
+
+    @Override
+    public BlockParser getActiveBlockParser() {
+        return openBlockParsers.get(openBlockParsers.size() - 1).blockParser;
+    }
+
+    /**
+     * Analyze a line of text and update the document appropriately. We parse markdown text by calling this on each
+     * line of input, then finalizing the document.
+     */
+    private void parseLine(CharSequence ln) {
+        setLine(ln);
+
+        // For each containing block, try to parse the associated line start.
+        // The document will always match, so we can skip the first block parser and start at 1 matches
+        int matches = 1;
+        for (int i = 1; i < openBlockParsers.size(); i++) {
+            OpenBlockParser openBlockParser = openBlockParsers.get(i);
+            BlockParser blockParser = openBlockParser.blockParser;
+            findNextNonSpace();
+
+            BlockContinue result = blockParser.tryContinue(this);
+            if (result instanceof BlockContinueImpl) {
+                BlockContinueImpl blockContinue = (BlockContinueImpl) result;
+                openBlockParser.sourceIndex = getIndex();
+                if (blockContinue.isFinalize()) {
+                    addSourceSpans();
+                    closeBlockParsers(openBlockParsers.size() - i);
+                    return;
+                } else {
+                    if (blockContinue.getNewIndex() != -1) {
+                        setNewIndex(blockContinue.getNewIndex());
+                    } else if (blockContinue.getNewColumn() != -1) {
+                        setNewColumn(blockContinue.getNewColumn());
+                    }
+                    matches++;
+                }
+            } else {
+                break;
+            }
+        }
+
+        int unmatchedBlocks = openBlockParsers.size() - matches;
+        BlockParser blockParser = openBlockParsers.get(matches - 1).blockParser;
+        boolean startedNewBlock = false;
+
+        int lastIndex = index;
+
+        // Unless last matched container is a code block, try new container starts,
+        // adding children to the last matched container:
+        boolean tryBlockStarts = blockParser.getBlock() instanceof Paragraph || blockParser.isContainer();
+        while (tryBlockStarts) {
+            lastIndex = index;
+            findNextNonSpace();
+
+            // this is a little performance optimization:
+            if (isBlank() || (indent < Parsing.CODE_BLOCK_INDENT && Characters.isLetter(this.line.getContent(), nextNonSpace))) {
+                setNewIndex(nextNonSpace);
+                break;
+            }
+
+            BlockStartImpl blockStart = findBlockStart(blockParser);
+            if (blockStart == null) {
+                setNewIndex(nextNonSpace);
+                break;
+            }
+
+            startedNewBlock = true;
+            int sourceIndex = getIndex();
+
+            // We're starting a new block. If we have any previous blocks that need to be closed, we need to do it now.
+            if (unmatchedBlocks > 0) {
+                closeBlockParsers(unmatchedBlocks);
+                unmatchedBlocks = 0;
+            }
+
+            if (blockStart.getNewIndex() != -1) {
+                setNewIndex(blockStart.getNewIndex());
+            } else if (blockStart.getNewColumn() != -1) {
+                setNewColumn(blockStart.getNewColumn());
+            }
+
+            List<SourceSpan> replacedSourceSpans = null;
+            if (blockStart.isReplaceActiveBlockParser()) {
+                Block replacedBlock = prepareActiveBlockParserForReplacement();
+                replacedSourceSpans = replacedBlock.getSourceSpans();
+            }
+
+            for (BlockParser newBlockParser : blockStart.getBlockParsers()) {
+                addChild(new OpenBlockParser(newBlockParser, sourceIndex));
+                if (replacedSourceSpans != null) {
+                    newBlockParser.getBlock().setSourceSpans(replacedSourceSpans);
+                }
+                blockParser = newBlockParser;
+                tryBlockStarts = newBlockParser.isContainer();
+            }
+        }
+
+        // What remains at the offset is a text line. Add the text to the
+        // appropriate block.
+
+        // First check for a lazy paragraph continuation:
+        if (!startedNewBlock && !isBlank() &&
+                getActiveBlockParser().canHaveLazyContinuationLines()) {
+            openBlockParsers.get(openBlockParsers.size() - 1).sourceIndex = lastIndex;
+            // lazy paragraph continuation
+            addLine();
+
+        } else {
+
+            // finalize any blocks not matched
+            if (unmatchedBlocks > 0) {
+                closeBlockParsers(unmatchedBlocks);
+            }
+
+            if (!blockParser.isContainer()) {
+                addLine();
+            } else if (!isBlank()) {
+                // create paragraph container for line
+                ParagraphParser paragraphParser = new ParagraphParser();
+                addChild(new OpenBlockParser(paragraphParser, lastIndex));
+                addLine();
+            } else {
+                // This can happen for a list item like this:
+                // ```
+                // *
+                // list item
+                // ```
+                //
+                // The first line does not start a paragraph yet, but we still want to record source positions.
+                addSourceSpans();
+            }
+        }
+    }
+
+    private void setLine(CharSequence ln) {
+        lineIndex++;
+        index = 0;
+        column = 0;
+        columnIsInTab = false;
+
+        CharSequence lineContent = prepareLine(ln);
+        SourceSpan sourceSpan = null;
+        if (includeSourceSpans != IncludeSourceSpans.NONE) {
+            sourceSpan = SourceSpan.of(lineIndex, 0, lineContent.length());
+        }
+        this.line = SourceLine.of(lineContent, sourceSpan);
+    }
+
+    private void findNextNonSpace() {
+        int i = index;
+        int cols = column;
+
+        blank = true;
+        int length = line.getContent().length();
+        while (i < length) {
+            char c = line.getContent().charAt(i);
+            switch (c) {
+                case ' ':
+                    i++;
+                    cols++;
+                    continue;
+                case '\t':
+                    i++;
+                    cols += (4 - (cols % 4));
+                    continue;
+            }
+            blank = false;
+            break;
+        }
+
+        nextNonSpace = i;
+        nextNonSpaceColumn = cols;
+        indent = nextNonSpaceColumn - column;
+    }
+
+    private void setNewIndex(int newIndex) {
+        if (newIndex >= nextNonSpace) {
+            // We can start from here, no need to calculate tab stops again
+            index = nextNonSpace;
+            column = nextNonSpaceColumn;
+        }
+        int length = line.getContent().length();
+        while (index < newIndex && index != length) {
+            advance();
+        }
+        // If we're going to an index as opposed to a column, we're never within a tab
+        columnIsInTab = false;
+    }
+
+    private void setNewColumn(int newColumn) {
+        if (newColumn >= nextNonSpaceColumn) {
+            // We can start from here, no need to calculate tab stops again
+            index = nextNonSpace;
+            column = nextNonSpaceColumn;
+        }
+        int length = line.getContent().length();
+        while (column < newColumn && index != length) {
+            advance();
+        }
+        if (column > newColumn) {
+            // Last character was a tab and we overshot our target
+            index--;
+            column = newColumn;
+            columnIsInTab = true;
+        } else {
+            columnIsInTab = false;
+        }
+    }
+
+    private void advance() {
+        char c = line.getContent().charAt(index);
+        index++;
+        if (c == '\t') {
+            column += Parsing.columnsToNextTabStop(column);
+        } else {
+            column++;
+        }
+    }
+
+    /**
+     * Add line content to the active block parser. We assume it can accept lines -- that check should be done before
+     * calling this.
+     */
+    private void addLine() {
+        CharSequence content;
+        if (columnIsInTab) {
+            // Our column is in a partially consumed tab. Expand the remaining columns (to the next tab stop) to spaces.
+            int afterTab = index + 1;
+            CharSequence rest = line.getContent().subSequence(afterTab, line.getContent().length());
+            int spaces = Parsing.columnsToNextTabStop(column);
+            StringBuilder sb = new StringBuilder(spaces + rest.length());
+            for (int i = 0; i < spaces; i++) {
+                sb.append(' ');
+            }
+            sb.append(rest);
+            content = sb.toString();
+        } else if (index == 0) {
+            content = line.getContent();
+        } else {
+            content = line.getContent().subSequence(index, line.getContent().length());
+        }
+        SourceSpan sourceSpan = null;
+        if (includeSourceSpans == IncludeSourceSpans.BLOCKS_AND_INLINES) {
+            // Note that if we're in a partially-consumed tab, the length here corresponds to the content but not to the
+            // actual source length. That sounds like a problem, but I haven't found a test case where it matters (yet).
+            sourceSpan = SourceSpan.of(lineIndex, index, content.length());
+        }
+        getActiveBlockParser().addLine(SourceLine.of(content, sourceSpan));
+        addSourceSpans();
+    }
+
+    private void addSourceSpans() {
+        if (includeSourceSpans != IncludeSourceSpans.NONE) {
+            // Don't add source spans for Document itself (it would get the whole source text)
+            for (int i = 1; i < openBlockParsers.size(); i++) {
+                OpenBlockParser openBlockParser = openBlockParsers.get(i);
+                int blockIndex = openBlockParser.sourceIndex;
+                int length = line.getContent().length() - blockIndex;
+                if (length != 0) {
+                    openBlockParser.blockParser.addSourceSpan(SourceSpan.of(lineIndex, blockIndex, length));
+                }
+            }
+        }
+    }
+
+    private BlockStartImpl findBlockStart(BlockParser blockParser) {
+        MatchedBlockParser matchedBlockParser = new MatchedBlockParserImpl(blockParser);
+        for (BlockParserFactory blockParserFactory : blockParserFactories) {
+            BlockStart result = blockParserFactory.tryStart(this, matchedBlockParser);
+            if (result instanceof BlockStartImpl) {
+                return (BlockStartImpl) result;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Finalize a block. Close it and do any necessary postprocessing, e.g. setting the content of blocks and
+     * collecting link reference definitions from paragraphs.
+     */
+    private void finalize(BlockParser blockParser) {
+        if (blockParser instanceof ParagraphParser) {
+            addDefinitionsFrom((ParagraphParser) blockParser);
+        }
+
+        blockParser.closeBlock();
+    }
+
+    private void addDefinitionsFrom(ParagraphParser paragraphParser) {
+        for (LinkReferenceDefinition definition : paragraphParser.getDefinitions()) {
+            // Add nodes into document before paragraph.
+            paragraphParser.getBlock().insertBefore(definition);
+
+            definitions.add(definition);
+        }
+    }
+
+    /**
+     * Walk through a block & children recursively, parsing string content into inline content where appropriate.
+     */
+    private void processInlines() {
+        InlineParserContextImpl context = new InlineParserContextImpl(delimiterProcessors, definitions);
+        InlineParser inlineParser = inlineParserFactory.create(context);
+
+        for (BlockParser blockParser : allBlockParsers) {
+            blockParser.parseInlines(inlineParser);
+        }
+    }
+
+    /**
+     * Add block of type tag as a child of the tip. If the tip can't accept children, close and finalize it and try
+     * its parent, and so on until we find a block that can accept children.
+     */
+    private void addChild(OpenBlockParser openBlockParser) {
+        while (!getActiveBlockParser().canContain(openBlockParser.blockParser.getBlock())) {
+            closeBlockParsers(1);
+        }
+
+        getActiveBlockParser().getBlock().appendChild(openBlockParser.blockParser.getBlock());
+        activateBlockParser(openBlockParser);
+    }
+
+    private void activateBlockParser(OpenBlockParser openBlockParser) {
+        openBlockParsers.add(openBlockParser);
+    }
+
+    private OpenBlockParser deactivateBlockParser() {
+        return openBlockParsers.remove(openBlockParsers.size() - 1);
+    }
+
+    private Block prepareActiveBlockParserForReplacement() {
+        // Note that we don't want to parse inlines, as it's getting replaced.
+        BlockParser old = deactivateBlockParser().blockParser;
+
+        if (old instanceof ParagraphParser) {
+            ParagraphParser paragraphParser = (ParagraphParser) old;
+            // Collect any link reference definitions. Note that replacing the active block parser is done after a
+            // block parser got the current paragraph content using MatchedBlockParser#getContentString. In case the
+            // paragraph started with link reference definitions, we parse and strip them before the block parser gets
+            // the content. We want to keep them.
+            // If no replacement happens, we collect the definitions as part of finalizing paragraph blocks.
+            addDefinitionsFrom(paragraphParser);
+        }
+
+        // Do this so that source positions are calculated, which we will carry over to the replacing block.
+        old.closeBlock();
+        old.getBlock().unlink();
+        return old.getBlock();
+    }
+
+    private Document finalizeAndProcess() {
+        closeBlockParsers(openBlockParsers.size());
+        processInlines();
+        return documentBlockParser.getBlock();
+    }
+
+    private void closeBlockParsers(int count) {
+        for (int i = 0; i < count; i++) {
+            BlockParser blockParser = deactivateBlockParser().blockParser;
+            finalize(blockParser);
+            // Remember for inline parsing. Note that a lot of blocks don't need inline parsing. We could have a
+            // separate interface (e.g. BlockParserWithInlines) so that we only have to remember those that actually
+            // have inlines to parse.
+            allBlockParsers.add(blockParser);
+        }
+    }
+
+    /**
+     * Prepares the input line replacing {@code \0}
+     */
+    private static CharSequence prepareLine(CharSequence line) {
+        // Avoid building a new string in the majority of cases (no \0)
+        StringBuilder sb = null;
+        int length = line.length();
+        for (int i = 0; i < length; i++) {
+            char c = line.charAt(i);
+            if (c == '\0') {
+                if (sb == null) {
+                    sb = new StringBuilder(length);
+                    sb.append(line, 0, i);
+                }
+                sb.append('\uFFFD');
+            } else {
+                if (sb != null) {
+                    sb.append(c);
+                }
+            }
+        }
+
+        if (sb != null) {
+            return sb.toString();
+        } else {
+            return line;
+        }
+    }
+
+    private static class MatchedBlockParserImpl implements MatchedBlockParser {
+
+        private final BlockParser matchedBlockParser;
+
+        public MatchedBlockParserImpl(BlockParser matchedBlockParser) {
+            this.matchedBlockParser = matchedBlockParser;
+        }
+
+        @Override
+        public BlockParser getMatchedBlockParser() {
+            return matchedBlockParser;
+        }
+
+        @Override
+        public SourceLines getParagraphLines() {
+            if (matchedBlockParser instanceof ParagraphParser) {
+                ParagraphParser paragraphParser = (ParagraphParser) matchedBlockParser;
+                return paragraphParser.getParagraphLines();
+            }
+            return SourceLines.empty();
+        }
+    }
+
+    private static class OpenBlockParser {
+        private final BlockParser blockParser;
+        private int sourceIndex;
+
+        OpenBlockParser(BlockParser blockParser, int sourceIndex) {
+            this.blockParser = blockParser;
+            this.sourceIndex = sourceIndex;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/FencedCodeBlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/FencedCodeBlockParser.java
new file mode 100644
index 00000000000..10a962a45c5
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/FencedCodeBlockParser.java
@@ -0,0 +1,171 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.util.Parsing;
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.FencedCodeBlock;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.block.*;
+import jdk.internal.org.commonmark.text.Characters;
+
+import static jdk.internal.org.commonmark.internal.util.Escaping.unescapeString;
+
+public class FencedCodeBlockParser extends AbstractBlockParser {
+
+    private final FencedCodeBlock block = new FencedCodeBlock();
+    private final char fenceChar;
+    private final int openingFenceLength;
+
+    private String firstLine;
+    private StringBuilder otherLines = new StringBuilder();
+
+    public FencedCodeBlockParser(char fenceChar, int fenceLength, int fenceIndent) {
+        this.fenceChar = fenceChar;
+        this.openingFenceLength = fenceLength;
+        block.setFenceCharacter(String.valueOf(fenceChar));
+        block.setOpeningFenceLength(fenceLength);
+        block.setFenceIndent(fenceIndent);
+    }
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        int nextNonSpace = state.getNextNonSpaceIndex();
+        int newIndex = state.getIndex();
+        CharSequence line = state.getLine().getContent();
+        if (state.getIndent() < Parsing.CODE_BLOCK_INDENT && nextNonSpace < line.length() && tryClosing(line, nextNonSpace)) {
+            // closing fence - we're at end of line, so we can finalize now
+            return BlockContinue.finished();
+        } else {
+            // skip optional spaces of fence indent
+            int i = block.getFenceIndent();
+            int length = line.length();
+            while (i > 0 && newIndex < length && line.charAt(newIndex) == ' ') {
+                newIndex++;
+                i--;
+            }
+        }
+        return BlockContinue.atIndex(newIndex);
+    }
+
+    @Override
+    public void addLine(SourceLine line) {
+        if (firstLine == null) {
+            firstLine = line.getContent().toString();
+        } else {
+            otherLines.append(line.getContent());
+            otherLines.append('\n');
+        }
+    }
+
+    @Override
+    public void closeBlock() {
+        // first line becomes info string
+        block.setInfo(unescapeString(firstLine.trim()));
+        block.setLiteral(otherLines.toString());
+    }
+
+    public static class Factory extends AbstractBlockParserFactory {
+
+        @Override
+        public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
+            int indent = state.getIndent();
+            if (indent >= Parsing.CODE_BLOCK_INDENT) {
+                return BlockStart.none();
+            }
+
+            int nextNonSpace = state.getNextNonSpaceIndex();
+            FencedCodeBlockParser blockParser = checkOpener(state.getLine().getContent(), nextNonSpace, indent);
+            if (blockParser != null) {
+                return BlockStart.of(blockParser).atIndex(nextNonSpace + blockParser.block.getOpeningFenceLength());
+            } else {
+                return BlockStart.none();
+            }
+        }
+    }
+
+    // spec: A code fence is a sequence of at least three consecutive backtick characters (`) or tildes (~). (Tildes and
+    // backticks cannot be mixed.)
+    private static FencedCodeBlockParser checkOpener(CharSequence line, int index, int indent) {
+        int backticks = 0;
+        int tildes = 0;
+        int length = line.length();
+        loop:
+        for (int i = index; i < length; i++) {
+            switch (line.charAt(i)) {
+                case '`':
+                    backticks++;
+                    break;
+                case '~':
+                    tildes++;
+                    break;
+                default:
+                    break loop;
+            }
+        }
+        if (backticks >= 3 && tildes == 0) {
+            // spec: If the info string comes after a backtick fence, it may not contain any backtick characters.
+            if (Characters.find('`', line, index + backticks) != -1) {
+                return null;
+            }
+            return new FencedCodeBlockParser('`', backticks, indent);
+        } else if (tildes >= 3 && backticks == 0) {
+            // spec: Info strings for tilde code blocks can contain backticks and tildes
+            return new FencedCodeBlockParser('~', tildes, indent);
+        } else {
+            return null;
+        }
+    }
+
+    // spec: The content of the code block consists of all subsequent lines, until a closing code fence of the same type
+    // as the code block began with (backticks or tildes), and with at least as many backticks or tildes as the opening
+    // code fence.
+    private boolean tryClosing(CharSequence line, int index) {
+        int fences = Characters.skip(fenceChar, line, index, line.length()) - index;
+        if (fences < openingFenceLength) {
+            return false;
+        }
+        // spec: The closing code fence [...] may be followed only by spaces, which are ignored.
+        int after = Characters.skipSpaceTab(line, index + fences, line.length());
+        if (after == line.length()) {
+            block.setClosingFenceLength(fences);
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/HeadingParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/HeadingParser.java
new file mode 100644
index 00000000000..cea8cb10366
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/HeadingParser.java
@@ -0,0 +1,188 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.util.Parsing;
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.Heading;
+import jdk.internal.org.commonmark.parser.InlineParser;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.SourceLines;
+import jdk.internal.org.commonmark.parser.beta.Position;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+import jdk.internal.org.commonmark.parser.block.*;
+import jdk.internal.org.commonmark.text.Characters;
+
+public class HeadingParser extends AbstractBlockParser {
+
+    private final Heading block = new Heading();
+    private final SourceLines content;
+
+    public HeadingParser(int level, SourceLines content) {
+        block.setLevel(level);
+        this.content = content;
+    }
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState parserState) {
+        // In both ATX and Setext headings, once we have the heading markup, there's nothing more to parse.
+        return BlockContinue.none();
+    }
+
+    @Override
+    public void parseInlines(InlineParser inlineParser) {
+        inlineParser.parse(content, block);
+    }
+
+    public static class Factory extends AbstractBlockParserFactory {
+
+        @Override
+        public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
+            if (state.getIndent() >= Parsing.CODE_BLOCK_INDENT) {
+                return BlockStart.none();
+            }
+
+            SourceLine line = state.getLine();
+            int nextNonSpace = state.getNextNonSpaceIndex();
+            if (line.getContent().charAt(nextNonSpace) == '#') {
+                HeadingParser atxHeading = getAtxHeading(line.substring(nextNonSpace, line.getContent().length()));
+                if (atxHeading != null) {
+                    return BlockStart.of(atxHeading).atIndex(line.getContent().length());
+                }
+            }
+
+            int setextHeadingLevel = getSetextHeadingLevel(line.getContent(), nextNonSpace);
+            if (setextHeadingLevel > 0) {
+                SourceLines paragraph = matchedBlockParser.getParagraphLines();
+                if (!paragraph.isEmpty()) {
+                    return BlockStart.of(new HeadingParser(setextHeadingLevel, paragraph))
+                            .atIndex(line.getContent().length())
+                            .replaceActiveBlockParser();
+                }
+            }
+
+            return BlockStart.none();
+        }
+    }
+
+    // spec: An ATX heading consists of a string of characters, parsed as inline content, between an opening sequence of
+    // 1\u20136 unescaped # characters and an optional closing sequence of any number of unescaped # characters. The opening
+    // sequence of # characters must be followed by a space or by the end of line. The optional closing sequence of #s
+    // must be preceded by a space and may be followed by spaces only.
+    private static HeadingParser getAtxHeading(SourceLine line) {
+        Scanner scanner = Scanner.of(SourceLines.of(line));
+        int level = scanner.matchMultiple('#');
+
+        if (level == 0 || level > 6) {
+            return null;
+        }
+
+        if (!scanner.hasNext()) {
+            // End of line after markers is an empty heading
+            return new HeadingParser(level, SourceLines.empty());
+        }
+
+        char next = scanner.peek();
+        if (!(next == ' ' || next == '\t')) {
+            return null;
+        }
+
+        scanner.whitespace();
+        Position start = scanner.position();
+        Position end = start;
+        boolean hashCanEnd = true;
+
+        while (scanner.hasNext()) {
+            char c = scanner.peek();
+            switch (c) {
+                case '#':
+                    if (hashCanEnd) {
+                        scanner.matchMultiple('#');
+                        int whitespace = scanner.whitespace();
+                        // If there's other characters, the hashes and spaces were part of the heading
+                        if (scanner.hasNext()) {
+                            end = scanner.position();
+                        }
+                        hashCanEnd = whitespace > 0;
+                    } else {
+                        scanner.next();
+                        end = scanner.position();
+                    }
+                    break;
+                case ' ':
+                case '\t':
+                    hashCanEnd = true;
+                    scanner.next();
+                    break;
+                default:
+                    hashCanEnd = false;
+                    scanner.next();
+                    end = scanner.position();
+            }
+        }
+
+        SourceLines source = scanner.getSource(start, end);
+        String content = source.getContent();
+        if (content.isEmpty()) {
+            return new HeadingParser(level, SourceLines.empty());
+        }
+        return new HeadingParser(level, source);
+    }
+
+    // spec: A setext heading underline is a sequence of = characters or a sequence of - characters, with no more than
+    // 3 spaces indentation and any number of trailing spaces.
+    @SuppressWarnings("fallthrough") private static int getSetextHeadingLevel(CharSequence line, int index) {
+        switch (line.charAt(index)) {
+            case '=':
+                if (isSetextHeadingRest(line, index + 1, '=')) {
+                    return 1;
+                }
+            case '-':
+                if (isSetextHeadingRest(line, index + 1, '-')) {
+                    return 2;
+                }
+        }
+        return 0;
+    }
+
+    private static boolean isSetextHeadingRest(CharSequence line, int index, char marker) {
+        int afterMarker = Characters.skip(marker, line, index, line.length());
+        int afterSpace = Characters.skipSpaceTab(line, afterMarker, line.length());
+        return afterSpace >= line.length();
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/HtmlBlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/HtmlBlockParser.java
new file mode 100644
index 00000000000..4fb7eb33da1
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/HtmlBlockParser.java
@@ -0,0 +1,178 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.HtmlBlock;
+import jdk.internal.org.commonmark.node.Paragraph;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.block.*;
+
+import java.util.regex.Pattern;
+
+public class HtmlBlockParser extends AbstractBlockParser {
+
+    private static final String TAGNAME = "[A-Za-z][A-Za-z0-9-]*";
+    private static final String ATTRIBUTENAME = "[a-zA-Z_:][a-zA-Z0-9:._-]*";
+    private static final String UNQUOTEDVALUE = "[^\"'=<>`\\x00-\\x20]+";
+    private static final String SINGLEQUOTEDVALUE = "'[^']*'";
+    private static final String DOUBLEQUOTEDVALUE = "\"[^\"]*\"";
+    private static final String ATTRIBUTEVALUE = "(?:" + UNQUOTEDVALUE + "|" + SINGLEQUOTEDVALUE
+            + "|" + DOUBLEQUOTEDVALUE + ")";
+    private static final String ATTRIBUTEVALUESPEC = "(?:" + "\\s*=" + "\\s*" + ATTRIBUTEVALUE
+            + ")";
+    private static final String ATTRIBUTE = "(?:" + "\\s+" + ATTRIBUTENAME + ATTRIBUTEVALUESPEC
+            + "?)";
+
+    private static final String OPENTAG = "<" + TAGNAME + ATTRIBUTE + "*" + "\\s*/?>";
+    private static final String CLOSETAG = "</" + TAGNAME + "\\s*[>]";
+
+    private static final Pattern[][] BLOCK_PATTERNS = new Pattern[][]{
+            {null, null}, // not used (no type 0)
+            {
+                    Pattern.compile("^<(?:script|pre|style|textarea)(?:\\s|>|$)", Pattern.CASE_INSENSITIVE),
+                    Pattern.compile("</(?:script|pre|style|textarea)>", Pattern.CASE_INSENSITIVE)
+            },
+            {
+                    Pattern.compile("^<!--"),
+                    Pattern.compile("-->")
+            },
+            {
+                    Pattern.compile("^<[?]"),
+                    Pattern.compile("\\?>")
+            },
+            {
+                    Pattern.compile("^<![A-Z]"),
+                    Pattern.compile(">")
+            },
+            {
+                    Pattern.compile("^<!\\[CDATA\\["),
+                    Pattern.compile("\\]\\]>")
+            },
+            {
+                    Pattern.compile("^</?(?:" +
+                            "address|article|aside|" +
+                            "base|basefont|blockquote|body|" +
+                            "caption|center|col|colgroup|" +
+                            "dd|details|dialog|dir|div|dl|dt|" +
+                            "fieldset|figcaption|figure|footer|form|frame|frameset|" +
+                            "h1|h2|h3|h4|h5|h6|head|header|hr|html|" +
+                            "iframe|" +
+                            "legend|li|link|" +
+                            "main|menu|menuitem|" +
+                            "nav|noframes|" +
+                            "ol|optgroup|option|" +
+                            "p|param|" +
+                            "search|section|summary|" +
+                            "table|tbody|td|tfoot|th|thead|title|tr|track|" +
+                            "ul" +
+                            ")(?:\\s|[/]?[>]|$)", Pattern.CASE_INSENSITIVE),
+                    null // terminated by blank line
+            },
+            {
+                    Pattern.compile("^(?:" + OPENTAG + '|' + CLOSETAG + ")\\s*$", Pattern.CASE_INSENSITIVE),
+                    null // terminated by blank line
+            }
+    };
+
+    private final HtmlBlock block = new HtmlBlock();
+    private final Pattern closingPattern;
+
+    private boolean finished = false;
+    private BlockContent content = new BlockContent();
+
+    private HtmlBlockParser(Pattern closingPattern) {
+        this.closingPattern = closingPattern;
+    }
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        if (finished) {
+            return BlockContinue.none();
+        }
+
+        // Blank line ends type 6 and type 7 blocks
+        if (state.isBlank() && closingPattern == null) {
+            return BlockContinue.none();
+        } else {
+            return BlockContinue.atIndex(state.getIndex());
+        }
+    }
+
+    @Override
+    public void addLine(SourceLine line) {
+        content.add(line.getContent());
+
+        if (closingPattern != null && closingPattern.matcher(line.getContent()).find()) {
+            finished = true;
+        }
+    }
+
+    @Override
+    public void closeBlock() {
+        block.setLiteral(content.getString());
+        content = null;
+    }
+
+    public static class Factory extends AbstractBlockParserFactory {
+
+        @Override
+        public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
+            int nextNonSpace = state.getNextNonSpaceIndex();
+            CharSequence line = state.getLine().getContent();
+
+            if (state.getIndent() < 4 && line.charAt(nextNonSpace) == '<') {
+                for (int blockType = 1; blockType <= 7; blockType++) {
+                    // Type 7 can not interrupt a paragraph (not even a lazy one)
+                    if (blockType == 7 && (
+                            matchedBlockParser.getMatchedBlockParser().getBlock() instanceof Paragraph ||
+                                    state.getActiveBlockParser().canHaveLazyContinuationLines())) {
+                        continue;
+                    }
+                    Pattern opener = BLOCK_PATTERNS[blockType][0];
+                    Pattern closer = BLOCK_PATTERNS[blockType][1];
+                    boolean matches = opener.matcher(line.subSequence(nextNonSpace, line.length())).find();
+                    if (matches) {
+                        return BlockStart.of(new HtmlBlockParser(closer)).atIndex(state.getIndex());
+                    }
+                }
+            }
+            return BlockStart.none();
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/IndentedCodeBlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/IndentedCodeBlockParser.java
new file mode 100644
index 00000000000..0b988407c0d
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/IndentedCodeBlockParser.java
@@ -0,0 +1,105 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.util.Parsing;
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.IndentedCodeBlock;
+import jdk.internal.org.commonmark.node.Paragraph;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.block.*;
+import jdk.internal.org.commonmark.text.Characters;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class IndentedCodeBlockParser extends AbstractBlockParser {
+
+    private final IndentedCodeBlock block = new IndentedCodeBlock();
+    private final List<CharSequence> lines = new ArrayList<>();
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        if (state.getIndent() >= Parsing.CODE_BLOCK_INDENT) {
+            return BlockContinue.atColumn(state.getColumn() + Parsing.CODE_BLOCK_INDENT);
+        } else if (state.isBlank()) {
+            return BlockContinue.atIndex(state.getNextNonSpaceIndex());
+        } else {
+            return BlockContinue.none();
+        }
+    }
+
+    @Override
+    public void addLine(SourceLine line) {
+        lines.add(line.getContent());
+    }
+
+    @Override
+    public void closeBlock() {
+        int lastNonBlank = lines.size() - 1;
+        while (lastNonBlank >= 0) {
+            if (!Characters.isBlank(lines.get(lastNonBlank))) {
+                break;
+            }
+            lastNonBlank--;
+        }
+
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < lastNonBlank + 1; i++) {
+            sb.append(lines.get(i));
+            sb.append('\n');
+        }
+
+        String literal = sb.toString();
+        block.setLiteral(literal);
+    }
+
+    public static class Factory extends AbstractBlockParserFactory {
+
+        @Override
+        public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
+            // An indented code block cannot interrupt a paragraph.
+            if (state.getIndent() >= Parsing.CODE_BLOCK_INDENT && !state.isBlank() && !(state.getActiveBlockParser().getBlock() instanceof Paragraph)) {
+                return BlockStart.of(new IndentedCodeBlockParser()).atColumn(state.getColumn() + Parsing.CODE_BLOCK_INDENT);
+            } else {
+                return BlockStart.none();
+            }
+        }
+    }
+}
+
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/InlineParserContextImpl.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/InlineParserContextImpl.java
new file mode 100644
index 00000000000..dab02aeedd1
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/InlineParserContextImpl.java
@@ -0,0 +1,62 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.node.LinkReferenceDefinition;
+import jdk.internal.org.commonmark.parser.InlineParserContext;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterProcessor;
+
+import java.util.List;
+import java.util.Map;
+
+public class InlineParserContextImpl implements InlineParserContext {
+
+    private final List<DelimiterProcessor> delimiterProcessors;
+    private final LinkReferenceDefinitions linkReferenceDefinitions;
+
+    public InlineParserContextImpl(List<DelimiterProcessor> delimiterProcessors,
+                                   LinkReferenceDefinitions linkReferenceDefinitions) {
+        this.delimiterProcessors = delimiterProcessors;
+        this.linkReferenceDefinitions = linkReferenceDefinitions;
+    }
+
+    @Override
+    public List<DelimiterProcessor> getCustomDelimiterProcessors() {
+        return delimiterProcessors;
+    }
+
+    @Override
+    public LinkReferenceDefinition getLinkReferenceDefinition(String label) {
+        return linkReferenceDefinitions.get(label);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/InlineParserImpl.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/InlineParserImpl.java
new file mode 100644
index 00000000000..3c0913a3206
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/InlineParserImpl.java
@@ -0,0 +1,787 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.inline.*;
+import jdk.internal.org.commonmark.internal.util.Escaping;
+import jdk.internal.org.commonmark.internal.util.LinkScanner;
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.parser.InlineParser;
+import jdk.internal.org.commonmark.parser.InlineParserContext;
+import jdk.internal.org.commonmark.parser.SourceLines;
+import jdk.internal.org.commonmark.parser.beta.Position;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterProcessor;
+import jdk.internal.org.commonmark.text.Characters;
+
+import java.util.*;
+
+public class InlineParserImpl implements InlineParser, InlineParserState {
+
+    private final BitSet specialCharacters;
+    private final Map<Character, DelimiterProcessor> delimiterProcessors;
+    private final InlineParserContext context;
+    private final Map<Character, List<InlineContentParser>> inlineParsers;
+
+    private Scanner scanner;
+    private boolean includeSourceSpans;
+    private int trailingSpaces;
+
+    /**
+     * Top delimiter (emphasis, strong emphasis or custom emphasis). (Brackets are on a separate stack, different
+     * from the algorithm described in the spec.)
+     */
+    private Delimiter lastDelimiter;
+
+    /**
+     * Top opening bracket (<code>[</code> or <code>![)</code>).
+     */
+    private Bracket lastBracket;
+
+    public InlineParserImpl(InlineParserContext inlineParserContext) {
+        this.delimiterProcessors = calculateDelimiterProcessors(inlineParserContext.getCustomDelimiterProcessors());
+
+        this.context = inlineParserContext;
+        this.inlineParsers = new HashMap<>();
+        this.inlineParsers.put('\\', Collections.<InlineContentParser>singletonList(new BackslashInlineParser()));
+        this.inlineParsers.put('`', Collections.<InlineContentParser>singletonList(new BackticksInlineParser()));
+        this.inlineParsers.put('&', Collections.<InlineContentParser>singletonList(new EntityInlineParser()));
+        this.inlineParsers.put('<', Arrays.asList(new AutolinkInlineParser(), new HtmlInlineParser()));
+
+        this.specialCharacters = calculateSpecialCharacters(this.delimiterProcessors.keySet(), inlineParsers.keySet());
+    }
+
+    public static BitSet calculateSpecialCharacters(Set<Character> delimiterCharacters, Set<Character> characters) {
+        BitSet bitSet = new BitSet();
+        for (Character c : delimiterCharacters) {
+            bitSet.set(c);
+        }
+        for (Character c : characters) {
+            bitSet.set(c);
+        }
+        bitSet.set('[');
+        bitSet.set(']');
+        bitSet.set('!');
+        bitSet.set('\n');
+        return bitSet;
+    }
+
+    public static Map<Character, DelimiterProcessor> calculateDelimiterProcessors(List<DelimiterProcessor> delimiterProcessors) {
+        Map<Character, DelimiterProcessor> map = new HashMap<>();
+        addDelimiterProcessors(Arrays.<DelimiterProcessor>asList(new AsteriskDelimiterProcessor(), new UnderscoreDelimiterProcessor()), map);
+        addDelimiterProcessors(delimiterProcessors, map);
+        return map;
+    }
+
+    @Override
+    public Scanner scanner() {
+        return scanner;
+    }
+
+    private static void addDelimiterProcessors(Iterable<DelimiterProcessor> delimiterProcessors, Map<Character, DelimiterProcessor> map) {
+        for (DelimiterProcessor delimiterProcessor : delimiterProcessors) {
+            char opening = delimiterProcessor.getOpeningCharacter();
+            char closing = delimiterProcessor.getClosingCharacter();
+            if (opening == closing) {
+                DelimiterProcessor old = map.get(opening);
+                if (old != null && old.getOpeningCharacter() == old.getClosingCharacter()) {
+                    StaggeredDelimiterProcessor s;
+                    if (old instanceof StaggeredDelimiterProcessor) {
+                        s = (StaggeredDelimiterProcessor) old;
+                    } else {
+                        s = new StaggeredDelimiterProcessor(opening);
+                        s.add(old);
+                    }
+                    s.add(delimiterProcessor);
+                    map.put(opening, s);
+                } else {
+                    addDelimiterProcessorForChar(opening, delimiterProcessor, map);
+                }
+            } else {
+                addDelimiterProcessorForChar(opening, delimiterProcessor, map);
+                addDelimiterProcessorForChar(closing, delimiterProcessor, map);
+            }
+        }
+    }
+
+    private static void addDelimiterProcessorForChar(char delimiterChar, DelimiterProcessor toAdd, Map<Character, DelimiterProcessor> delimiterProcessors) {
+        DelimiterProcessor existing = delimiterProcessors.put(delimiterChar, toAdd);
+        if (existing != null) {
+            throw new IllegalArgumentException("Delimiter processor conflict with delimiter char '" + delimiterChar + "'");
+        }
+    }
+
+    /**
+     * Parse content in block into inline children, appending them to the block node.
+     */
+    @Override
+    public void parse(SourceLines lines, Node block) {
+        reset(lines);
+
+        while (true) {
+            List<? extends Node> nodes = parseInline();
+            if (nodes != null) {
+                for (Node node : nodes) {
+                    block.appendChild(node);
+                }
+            } else {
+                break;
+            }
+        }
+
+        processDelimiters(null);
+        mergeChildTextNodes(block);
+    }
+
+    void reset(SourceLines lines) {
+        this.scanner = Scanner.of(lines);
+        this.includeSourceSpans = !lines.getSourceSpans().isEmpty();
+        this.trailingSpaces = 0;
+        this.lastDelimiter = null;
+        this.lastBracket = null;
+    }
+
+    private Text text(SourceLines sourceLines) {
+        Text text = new Text(sourceLines.getContent());
+        text.setSourceSpans(sourceLines.getSourceSpans());
+        return text;
+    }
+
+    /**
+     * Parse the next inline element in subject, advancing our position.
+     * On success, return the new inline node.
+     * On failure, return null.
+     */
+    private List<? extends Node> parseInline() {
+        char c = scanner.peek();
+
+        switch (c) {
+            case '[':
+                return Collections.singletonList(parseOpenBracket());
+            case '!':
+                return Collections.singletonList(parseBang());
+            case ']':
+                return Collections.singletonList(parseCloseBracket());
+            case '\n':
+                return Collections.singletonList(parseLineBreak());
+            case Scanner.END:
+                return null;
+        }
+
+        // No inline parser, delimiter or other special handling.
+        if (!specialCharacters.get(c)) {
+            return Collections.singletonList(parseText());
+        }
+
+        List<InlineContentParser> inlineParsers = this.inlineParsers.get(c);
+        if (inlineParsers != null) {
+            Position position = scanner.position();
+            for (InlineContentParser inlineParser : inlineParsers) {
+                ParsedInline parsedInline = inlineParser.tryParse(this);
+                if (parsedInline instanceof ParsedInlineImpl) {
+                    ParsedInlineImpl parsedInlineImpl = (ParsedInlineImpl) parsedInline;
+                    Node node = parsedInlineImpl.getNode();
+                    scanner.setPosition(parsedInlineImpl.getPosition());
+                    if (includeSourceSpans && node.getSourceSpans().isEmpty()) {
+                        node.setSourceSpans(scanner.getSource(position, scanner.position()).getSourceSpans());
+                    }
+                    return Collections.singletonList(node);
+                } else {
+                    // Reset position
+                    scanner.setPosition(position);
+                }
+            }
+        }
+
+        DelimiterProcessor delimiterProcessor = delimiterProcessors.get(c);
+        if (delimiterProcessor != null) {
+            List<? extends Node> nodes = parseDelimiters(delimiterProcessor, c);
+            if (nodes != null) {
+                return nodes;
+            }
+        }
+
+        // If we get here, even for a special/delimiter character, we will just treat it as text.
+        return Collections.singletonList(parseText());
+    }
+
+    /**
+     * Attempt to parse delimiters like emphasis, strong emphasis or custom delimiters.
+     */
+    private List<? extends Node> parseDelimiters(DelimiterProcessor delimiterProcessor, char delimiterChar) {
+        DelimiterData res = scanDelimiters(delimiterProcessor, delimiterChar);
+        if (res == null) {
+            return null;
+        }
+
+        List<Text> characters = res.characters;
+
+        // Add entry to stack for this opener
+        lastDelimiter = new Delimiter(characters, delimiterChar, res.canOpen, res.canClose, lastDelimiter);
+        if (lastDelimiter.previous != null) {
+            lastDelimiter.previous.next = lastDelimiter;
+        }
+
+        return characters;
+    }
+
+    /**
+     * Add open bracket to delimiter stack and add a text node to block's children.
+     */
+    private Node parseOpenBracket() {
+        Position start = scanner.position();
+        scanner.next();
+        Position contentPosition = scanner.position();
+
+        Text node = text(scanner.getSource(start, contentPosition));
+
+        // Add entry to stack for this opener
+        addBracket(Bracket.link(node, start, contentPosition, lastBracket, lastDelimiter));
+
+        return node;
+    }
+
+    /**
+     * If next character is [, and ! delimiter to delimiter stack and add a text node to block's children.
+     * Otherwise just add a text node.
+     */
+    private Node parseBang() {
+        Position start = scanner.position();
+        scanner.next();
+        if (scanner.next('[')) {
+            Position contentPosition = scanner.position();
+            Text node = text(scanner.getSource(start, contentPosition));
+
+            // Add entry to stack for this opener
+            addBracket(Bracket.image(node, start, contentPosition, lastBracket, lastDelimiter));
+            return node;
+        } else {
+            return text(scanner.getSource(start, scanner.position()));
+        }
+    }
+
+    /**
+     * Try to match close bracket against an opening in the delimiter stack. Return either a link or image, or a
+     * plain [ character. If there is a matching delimiter, remove it from the delimiter stack.
+     */
+    private Node parseCloseBracket() {
+        Position beforeClose = scanner.position();
+        scanner.next();
+        Position afterClose = scanner.position();
+
+        // Get previous `[` or `![`
+        Bracket opener = lastBracket;
+        if (opener == null) {
+            // No matching opener, just return a literal.
+            return text(scanner.getSource(beforeClose, afterClose));
+        }
+
+        if (!opener.allowed) {
+            // Matching opener but it's not allowed, just return a literal.
+            removeLastBracket();
+            return text(scanner.getSource(beforeClose, afterClose));
+        }
+
+        // Check to see if we have a link/image
+        String dest = null;
+        String title = null;
+
+        // Maybe a inline link like `[foo](/uri "title")`
+        if (scanner.next('(')) {
+            scanner.whitespace();
+            dest = parseLinkDestination(scanner);
+            if (dest == null) {
+                scanner.setPosition(afterClose);
+            } else {
+                int whitespace = scanner.whitespace();
+                // title needs a whitespace before
+                if (whitespace >= 1) {
+                    title = parseLinkTitle(scanner);
+                    scanner.whitespace();
+                }
+                if (!scanner.next(')')) {
+                    // Don't have a closing `)`, so it's not a destination and title -> reset.
+                    // Note that something like `[foo](` could be valid, `(` will just be text.
+                    scanner.setPosition(afterClose);
+                    dest = null;
+                    title = null;
+                }
+            }
+        }
+
+        // Maybe a reference link like `[foo][bar]`, `[foo][]` or `[foo]`.
+        // Note that even `[foo](` could be a valid link if there's a reference, which is why this is not just an `else`
+        // here.
+        if (dest == null) {
+            // See if there's a link label like `[bar]` or `[]`
+            String ref = parseLinkLabel(scanner);
+            if (ref == null) {
+                scanner.setPosition(afterClose);
+            }
+            if ((ref == null || ref.isEmpty()) && !opener.bracketAfter) {
+                // If the second label is empty `[foo][]` or missing `[foo]`, then the first label is the reference.
+                // But it can only be a reference when there's no (unescaped) bracket in it.
+                // If there is, we don't even need to try to look up the reference. This is an optimization.
+                ref = scanner.getSource(opener.contentPosition, beforeClose).getContent();
+            }
+
+            if (ref != null) {
+                LinkReferenceDefinition definition = context.getLinkReferenceDefinition(ref);
+                if (definition != null) {
+                    dest = definition.getDestination();
+                    title = definition.getTitle();
+                }
+            }
+        }
+
+        if (dest != null) {
+            // If we got here, we have a link or image
+            Node linkOrImage = opener.image ? new Image(dest, title) : new Link(dest, title);
+
+            // Add all nodes between the opening bracket and now (closing bracket) as child nodes of the link
+            Node node = opener.node.getNext();
+            while (node != null) {
+                Node next = node.getNext();
+                linkOrImage.appendChild(node);
+                node = next;
+            }
+
+            if (includeSourceSpans) {
+                linkOrImage.setSourceSpans(scanner.getSource(opener.markerPosition, scanner.position()).getSourceSpans());
+            }
+
+            // Process delimiters such as emphasis inside link/image
+            processDelimiters(opener.previousDelimiter);
+            mergeChildTextNodes(linkOrImage);
+            // We don't need the corresponding text node anymore, we turned it into a link/image node
+            opener.node.unlink();
+            removeLastBracket();
+
+            // Links within links are not allowed. We found this link, so there can be no other link around it.
+            if (!opener.image) {
+                Bracket bracket = lastBracket;
+                while (bracket != null) {
+                    if (!bracket.image) {
+                        // Disallow link opener. It will still get matched, but will not result in a link.
+                        bracket.allowed = false;
+                    }
+                    bracket = bracket.previous;
+                }
+            }
+
+            return linkOrImage;
+
+        } else {
+            // No link or image, parse just the bracket as text and continue
+            removeLastBracket();
+
+            scanner.setPosition(afterClose);
+            return text(scanner.getSource(beforeClose, afterClose));
+        }
+    }
+
+    private void addBracket(Bracket bracket) {
+        if (lastBracket != null) {
+            lastBracket.bracketAfter = true;
+        }
+        lastBracket = bracket;
+    }
+
+    private void removeLastBracket() {
+        lastBracket = lastBracket.previous;
+    }
+
+    /**
+     * Attempt to parse link destination, returning the string or null if no match.
+     */
+    private String parseLinkDestination(Scanner scanner) {
+        char delimiter = scanner.peek();
+        Position start = scanner.position();
+        if (!LinkScanner.scanLinkDestination(scanner)) {
+            return null;
+        }
+
+        String dest;
+        if (delimiter == '<') {
+            // chop off surrounding <..>:
+            String rawDestination = scanner.getSource(start, scanner.position()).getContent();
+            dest = rawDestination.substring(1, rawDestination.length() - 1);
+        } else {
+            dest = scanner.getSource(start, scanner.position()).getContent();
+        }
+
+        return Escaping.unescapeString(dest);
+    }
+
+    /**
+     * Attempt to parse link title (sans quotes), returning the string or null if no match.
+     */
+    private String parseLinkTitle(Scanner scanner) {
+        Position start = scanner.position();
+        if (!LinkScanner.scanLinkTitle(scanner)) {
+            return null;
+        }
+
+        // chop off ', " or parens
+        String rawTitle = scanner.getSource(start, scanner.position()).getContent();
+        String title = rawTitle.substring(1, rawTitle.length() - 1);
+        return Escaping.unescapeString(title);
+    }
+
+    /**
+     * Attempt to parse a link label, returning the label between the brackets or null.
+     */
+    String parseLinkLabel(Scanner scanner) {
+        if (!scanner.next('[')) {
+            return null;
+        }
+
+        Position start = scanner.position();
+        if (!LinkScanner.scanLinkLabelContent(scanner)) {
+            return null;
+        }
+        Position end = scanner.position();
+
+        if (!scanner.next(']')) {
+            return null;
+        }
+
+        String content = scanner.getSource(start, end).getContent();
+        // spec: A link label can have at most 999 characters inside the square brackets.
+        if (content.length() > 999) {
+            return null;
+        }
+
+        return content;
+    }
+
+    private Node parseLineBreak() {
+        scanner.next();
+
+        if (trailingSpaces >= 2) {
+            return new HardLineBreak();
+        } else {
+            return new SoftLineBreak();
+        }
+    }
+
+    /**
+     * Parse the next character as plain text, and possibly more if the following characters are non-special.
+     */
+    private Node parseText() {
+        Position start = scanner.position();
+        scanner.next();
+        char c;
+        while (true) {
+            c = scanner.peek();
+            if (c == Scanner.END || specialCharacters.get(c)) {
+                break;
+            }
+            scanner.next();
+        }
+
+        SourceLines source = scanner.getSource(start, scanner.position());
+        String content = source.getContent();
+
+        if (c == '\n') {
+            // We parsed until the end of the line. Trim any trailing spaces and remember them (for hard line breaks).
+            int end = Characters.skipBackwards(' ', content, content.length() - 1, 0) + 1;
+            trailingSpaces = content.length() - end;
+            content = content.substring(0, end);
+        } else if (c == Scanner.END) {
+            // For the last line, both tabs and spaces are trimmed for some reason (checked with commonmark.js).
+            int end = Characters.skipSpaceTabBackwards(content, content.length() - 1, 0) + 1;
+            content = content.substring(0, end);
+        }
+
+        Text text = new Text(content);
+        text.setSourceSpans(source.getSourceSpans());
+        return text;
+    }
+
+    /**
+     * Scan a sequence of characters with code delimiterChar, and return information about the number of delimiters
+     * and whether they are positioned such that they can open and/or close emphasis or strong emphasis.
+     *
+     * @return information about delimiter run, or {@code null}
+     */
+    private DelimiterData scanDelimiters(DelimiterProcessor delimiterProcessor, char delimiterChar) {
+        int before = scanner.peekPreviousCodePoint();
+        Position start = scanner.position();
+
+        // Quick check to see if we have enough delimiters.
+        int delimiterCount = scanner.matchMultiple(delimiterChar);
+        if (delimiterCount < delimiterProcessor.getMinLength()) {
+            scanner.setPosition(start);
+            return null;
+        }
+
+        // We do have enough, extract a text node for each delimiter character.
+        List<Text> delimiters = new ArrayList<>();
+        scanner.setPosition(start);
+        Position positionBefore = start;
+        while (scanner.next(delimiterChar)) {
+            delimiters.add(text(scanner.getSource(positionBefore, scanner.position())));
+            positionBefore = scanner.position();
+        }
+
+        int after = scanner.peekCodePoint();
+
+        // We could be more lazy here, in most cases we don't need to do every match case.
+        boolean beforeIsPunctuation = before == Scanner.END || Characters.isPunctuationCodePoint(before);
+        boolean beforeIsWhitespace = before == Scanner.END || Characters.isWhitespaceCodePoint(before);
+        boolean afterIsPunctuation = after == Scanner.END || Characters.isPunctuationCodePoint(after);
+        boolean afterIsWhitespace = after == Scanner.END || Characters.isWhitespaceCodePoint(after);
+
+        boolean leftFlanking = !afterIsWhitespace &&
+                (!afterIsPunctuation || beforeIsWhitespace || beforeIsPunctuation);
+        boolean rightFlanking = !beforeIsWhitespace &&
+                (!beforeIsPunctuation || afterIsWhitespace || afterIsPunctuation);
+        boolean canOpen;
+        boolean canClose;
+        if (delimiterChar == '_') {
+            canOpen = leftFlanking && (!rightFlanking || beforeIsPunctuation);
+            canClose = rightFlanking && (!leftFlanking || afterIsPunctuation);
+        } else {
+            canOpen = leftFlanking && delimiterChar == delimiterProcessor.getOpeningCharacter();
+            canClose = rightFlanking && delimiterChar == delimiterProcessor.getClosingCharacter();
+        }
+
+        return new DelimiterData(delimiters, canOpen, canClose);
+    }
+
+    private void processDelimiters(Delimiter stackBottom) {
+
+        Map<Character, Delimiter> openersBottom = new HashMap<>();
+
+        // find first closer above stackBottom:
+        Delimiter closer = lastDelimiter;
+        while (closer != null && closer.previous != stackBottom) {
+            closer = closer.previous;
+        }
+        // move forward, looking for closers, and handling each
+        while (closer != null) {
+            char delimiterChar = closer.delimiterChar;
+
+            DelimiterProcessor delimiterProcessor = delimiterProcessors.get(delimiterChar);
+            if (!closer.canClose() || delimiterProcessor == null) {
+                closer = closer.next;
+                continue;
+            }
+
+            char openingDelimiterChar = delimiterProcessor.getOpeningCharacter();
+
+            // Found delimiter closer. Now look back for first matching opener.
+            int usedDelims = 0;
+            boolean openerFound = false;
+            boolean potentialOpenerFound = false;
+            Delimiter opener = closer.previous;
+            while (opener != null && opener != stackBottom && opener != openersBottom.get(delimiterChar)) {
+                if (opener.canOpen() && opener.delimiterChar == openingDelimiterChar) {
+                    potentialOpenerFound = true;
+                    usedDelims = delimiterProcessor.process(opener, closer);
+                    if (usedDelims > 0) {
+                        openerFound = true;
+                        break;
+                    }
+                }
+                opener = opener.previous;
+            }
+
+            if (!openerFound) {
+                if (!potentialOpenerFound) {
+                    // Set lower bound for future searches for openers.
+                    // Only do this when we didn't even have a potential
+                    // opener (one that matches the character and can open).
+                    // If an opener was rejected because of the number of
+                    // delimiters (e.g. because of the "multiple of 3" rule),
+                    // we want to consider it next time because the number
+                    // of delimiters can change as we continue processing.
+                    openersBottom.put(delimiterChar, closer.previous);
+                    if (!closer.canOpen()) {
+                        // We can remove a closer that can't be an opener,
+                        // once we've seen there's no matching opener:
+                        removeDelimiterKeepNode(closer);
+                    }
+                }
+                closer = closer.next;
+                continue;
+            }
+
+            // Remove number of used delimiters nodes.
+            for (int i = 0; i < usedDelims; i++) {
+                Text delimiter = opener.characters.remove(opener.characters.size() - 1);
+                delimiter.unlink();
+            }
+            for (int i = 0; i < usedDelims; i++) {
+                Text delimiter = closer.characters.remove(0);
+                delimiter.unlink();
+            }
+
+            removeDelimitersBetween(opener, closer);
+
+            // No delimiter characters left to process, so we can remove delimiter and the now empty node.
+            if (opener.length() == 0) {
+                removeDelimiterAndNodes(opener);
+            }
+
+            if (closer.length() == 0) {
+                Delimiter next = closer.next;
+                removeDelimiterAndNodes(closer);
+                closer = next;
+            }
+        }
+
+        // remove all delimiters
+        while (lastDelimiter != null && lastDelimiter != stackBottom) {
+            removeDelimiterKeepNode(lastDelimiter);
+        }
+    }
+
+    private void removeDelimitersBetween(Delimiter opener, Delimiter closer) {
+        Delimiter delimiter = closer.previous;
+        while (delimiter != null && delimiter != opener) {
+            Delimiter previousDelimiter = delimiter.previous;
+            removeDelimiterKeepNode(delimiter);
+            delimiter = previousDelimiter;
+        }
+    }
+
+    /**
+     * Remove the delimiter and the corresponding text node. For used delimiters, e.g. `*` in `*foo*`.
+     */
+    private void removeDelimiterAndNodes(Delimiter delim) {
+        removeDelimiter(delim);
+    }
+
+    /**
+     * Remove the delimiter but keep the corresponding node as text. For unused delimiters such as `_` in `foo_bar`.
+     */
+    private void removeDelimiterKeepNode(Delimiter delim) {
+        removeDelimiter(delim);
+    }
+
+    private void removeDelimiter(Delimiter delim) {
+        if (delim.previous != null) {
+            delim.previous.next = delim.next;
+        }
+        if (delim.next == null) {
+            // top of stack
+            lastDelimiter = delim.previous;
+        } else {
+            delim.next.previous = delim.previous;
+        }
+    }
+
+    private void mergeChildTextNodes(Node node) {
+        // No children, no need for merging
+        if (node.getFirstChild() == null) {
+            return;
+        }
+
+        mergeTextNodesInclusive(node.getFirstChild(), node.getLastChild());
+    }
+
+    private void mergeTextNodesInclusive(Node fromNode, Node toNode) {
+        Text first = null;
+        Text last = null;
+        int length = 0;
+
+        Node node = fromNode;
+        while (node != null) {
+            if (node instanceof Text) {
+                Text text = (Text) node;
+                if (first == null) {
+                    first = text;
+                }
+                length += text.getLiteral().length();
+                last = text;
+            } else {
+                mergeIfNeeded(first, last, length);
+                first = null;
+                last = null;
+                length = 0;
+
+                mergeChildTextNodes(node);
+            }
+            if (node == toNode) {
+                break;
+            }
+            node = node.getNext();
+        }
+
+        mergeIfNeeded(first, last, length);
+    }
+
+    private void mergeIfNeeded(Text first, Text last, int textLength) {
+        if (first != null && last != null && first != last) {
+            StringBuilder sb = new StringBuilder(textLength);
+            sb.append(first.getLiteral());
+            SourceSpans sourceSpans = null;
+            if (includeSourceSpans) {
+                sourceSpans = new SourceSpans();
+                sourceSpans.addAll(first.getSourceSpans());
+            }
+            Node node = first.getNext();
+            Node stop = last.getNext();
+            while (node != stop) {
+                sb.append(((Text) node).getLiteral());
+                if (sourceSpans != null) {
+                    sourceSpans.addAll(node.getSourceSpans());
+                }
+
+                Node unlink = node;
+                node = node.getNext();
+                unlink.unlink();
+            }
+            String literal = sb.toString();
+            first.setLiteral(literal);
+            if (sourceSpans != null) {
+                first.setSourceSpans(sourceSpans.getSourceSpans());
+            }
+        }
+    }
+
+    private static class DelimiterData {
+
+        final List<Text> characters;
+        final boolean canClose;
+        final boolean canOpen;
+
+        DelimiterData(List<Text> characters, boolean canOpen, boolean canClose) {
+            this.characters = characters;
+            this.canOpen = canOpen;
+            this.canClose = canClose;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/LinkReferenceDefinitionParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/LinkReferenceDefinitionParser.java
new file mode 100644
index 00000000000..35db88cc2ba
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/LinkReferenceDefinitionParser.java
@@ -0,0 +1,313 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.util.Escaping;
+import jdk.internal.org.commonmark.internal.util.LinkScanner;
+import jdk.internal.org.commonmark.node.LinkReferenceDefinition;
+import jdk.internal.org.commonmark.node.SourceSpan;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.SourceLines;
+import jdk.internal.org.commonmark.parser.beta.Position;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Parser for link reference definitions at the beginning of a paragraph.
+ *
+ * @see <a href="https://spec.commonmark.org/0.29/#link-reference-definition">Link reference definitions</a>
+ */
+public class LinkReferenceDefinitionParser {
+
+    private State state = State.START_DEFINITION;
+
+    private final List<SourceLine> paragraphLines = new ArrayList<>();
+    private final List<LinkReferenceDefinition> definitions = new ArrayList<>();
+    private final List<SourceSpan> sourceSpans = new ArrayList<>();
+
+    private StringBuilder label;
+    private String destination;
+    private char titleDelimiter;
+    private StringBuilder title;
+    private boolean referenceValid = false;
+
+    public void parse(SourceLine line) {
+        paragraphLines.add(line);
+        if (state == State.PARAGRAPH) {
+            // We're in a paragraph now. Link reference definitions can only appear at the beginning, so once
+            // we're in a paragraph, there's no going back.
+            return;
+        }
+
+        Scanner scanner = Scanner.of(SourceLines.of(line));
+        while (scanner.hasNext()) {
+            boolean success;
+            switch (state) {
+                case START_DEFINITION: {
+                    success = startDefinition(scanner);
+                    break;
+                }
+                case LABEL: {
+                    success = label(scanner);
+                    break;
+                }
+                case DESTINATION: {
+                    success = destination(scanner);
+                    break;
+                }
+                case START_TITLE: {
+                    success = startTitle(scanner);
+                    break;
+                }
+                case TITLE: {
+                    success = title(scanner);
+                    break;
+                }
+                default: {
+                    throw new IllegalStateException("Unknown parsing state: " + state);
+                }
+            }
+            // Parsing failed, which means we fall back to treating text as a paragraph.
+            if (!success) {
+                state = State.PARAGRAPH;
+                return;
+            }
+        }
+    }
+
+    public void addSourceSpan(SourceSpan sourceSpan) {
+        sourceSpans.add(sourceSpan);
+    }
+
+    /**
+     * @return the lines that are normal paragraph content, without newlines
+     */
+    SourceLines getParagraphLines() {
+        return SourceLines.of(paragraphLines);
+    }
+
+    List<SourceSpan> getParagraphSourceSpans() {
+        return sourceSpans;
+    }
+
+    List<LinkReferenceDefinition> getDefinitions() {
+        finishReference();
+        return definitions;
+    }
+
+    State getState() {
+        return state;
+    }
+
+    private boolean startDefinition(Scanner scanner) {
+        // Finish any outstanding references now. We don't do this earlier because we need addSourceSpan to have been
+        // called before we do it.
+        finishReference();
+
+        scanner.whitespace();
+        if (!scanner.next('[')) {
+            return false;
+        }
+
+        state = State.LABEL;
+        label = new StringBuilder();
+
+        if (!scanner.hasNext()) {
+            label.append('\n');
+        }
+        return true;
+    }
+
+    private boolean label(Scanner scanner) {
+        Position start = scanner.position();
+        if (!LinkScanner.scanLinkLabelContent(scanner)) {
+            return false;
+        }
+
+        label.append(scanner.getSource(start, scanner.position()).getContent());
+
+        if (!scanner.hasNext()) {
+            // label might continue on next line
+            label.append('\n');
+            return true;
+        } else if (scanner.next(']')) {
+            // end of label
+            if (!scanner.next(':')) {
+                return false;
+            }
+
+            // spec: A link label can have at most 999 characters inside the square brackets.
+            if (label.length() > 999) {
+                return false;
+            }
+
+            String normalizedLabel = Escaping.normalizeLabelContent(label.toString());
+            if (normalizedLabel.isEmpty()) {
+                return false;
+            }
+
+            state = State.DESTINATION;
+
+            scanner.whitespace();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    private boolean destination(Scanner scanner) {
+        scanner.whitespace();
+        Position start = scanner.position();
+        if (!LinkScanner.scanLinkDestination(scanner)) {
+            return false;
+        }
+
+        String rawDestination = scanner.getSource(start, scanner.position()).getContent();
+        destination = rawDestination.startsWith("<") ?
+                rawDestination.substring(1, rawDestination.length() - 1) :
+                rawDestination;
+
+        int whitespace = scanner.whitespace();
+        if (!scanner.hasNext()) {
+            // Destination was at end of line, so this is a valid reference for sure (and maybe a title).
+            // If not at end of line, wait for title to be valid first.
+            referenceValid = true;
+            paragraphLines.clear();
+        } else if (whitespace == 0) {
+            // spec: The title must be separated from the link destination by whitespace
+            return false;
+        }
+
+        state = State.START_TITLE;
+        return true;
+    }
+
+    private boolean startTitle(Scanner scanner) {
+        scanner.whitespace();
+        if (!scanner.hasNext()) {
+            state = State.START_DEFINITION;
+            return true;
+        }
+
+        titleDelimiter = '\0';
+        char c = scanner.peek();
+        switch (c) {
+            case '"':
+            case '\'':
+                titleDelimiter = c;
+                break;
+            case '(':
+                titleDelimiter = ')';
+                break;
+        }
+
+        if (titleDelimiter != '\0') {
+            state = State.TITLE;
+            title = new StringBuilder();
+            scanner.next();
+            if (!scanner.hasNext()) {
+                title.append('\n');
+            }
+        } else {
+            // There might be another reference instead, try that for the same character.
+            state = State.START_DEFINITION;
+        }
+        return true;
+    }
+
+    private boolean title(Scanner scanner) {
+        Position start = scanner.position();
+        if (!LinkScanner.scanLinkTitleContent(scanner, titleDelimiter)) {
+            // Invalid title, stop
+            return false;
+        }
+
+        title.append(scanner.getSource(start, scanner.position()).getContent());
+
+        if (!scanner.hasNext()) {
+            // Title ran until the end of line, so continue on next line (until we find the delimiter)
+            title.append('\n');
+            return true;
+        }
+
+        // Skip delimiter character
+        scanner.next();
+        scanner.whitespace();
+        if (scanner.hasNext()) {
+            // spec: No further non-whitespace characters may occur on the line.
+            return false;
+        }
+        referenceValid = true;
+        paragraphLines.clear();
+
+        // See if there's another definition.
+        state = State.START_DEFINITION;
+        return true;
+    }
+
+    private void finishReference() {
+        if (!referenceValid) {
+            return;
+        }
+
+        String d = Escaping.unescapeString(destination);
+        String t = title != null ? Escaping.unescapeString(title.toString()) : null;
+        LinkReferenceDefinition definition = new LinkReferenceDefinition(label.toString(), d, t);
+        definition.setSourceSpans(sourceSpans);
+        sourceSpans.clear();
+        definitions.add(definition);
+
+        label = null;
+        referenceValid = false;
+        destination = null;
+        title = null;
+    }
+
+    enum State {
+        // Looking for the start of a definition, i.e. `[`
+        START_DEFINITION,
+        // Parsing the label, i.e. `foo` within `[foo]`
+        LABEL,
+        // Parsing the destination, i.e. `/url` in `[foo]: /url`
+        DESTINATION,
+        // Looking for the start of a title, i.e. the first `"` in `[foo]: /url "title"`
+        START_TITLE,
+        // Parsing the content of the title, i.e. `title` in `[foo]: /url "title"`
+        TITLE,
+
+        // End state, no matter what kind of lines we add, they won't be references
+        PARAGRAPH,
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/LinkReferenceDefinitions.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/LinkReferenceDefinitions.java
new file mode 100644
index 00000000000..e1def1de98e
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/LinkReferenceDefinitions.java
@@ -0,0 +1,59 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.util.Escaping;
+import jdk.internal.org.commonmark.node.LinkReferenceDefinition;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class LinkReferenceDefinitions {
+
+    // LinkedHashMap for determinism and to preserve document order
+    private final Map<String, LinkReferenceDefinition> definitions = new LinkedHashMap<>();
+
+    public void add(LinkReferenceDefinition definition) {
+        String normalizedLabel = Escaping.normalizeLabelContent(definition.getLabel());
+
+        // spec: When there are multiple matching link reference definitions, the first is used
+        if (!definitions.containsKey(normalizedLabel)) {
+            definitions.put(normalizedLabel, definition);
+        }
+    }
+
+    public LinkReferenceDefinition get(String label) {
+        String normalizedLabel = Escaping.normalizeLabelContent(label);
+        return definitions.get(normalizedLabel);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ListBlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ListBlockParser.java
new file mode 100644
index 00000000000..89a3c2332cb
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ListBlockParser.java
@@ -0,0 +1,286 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.util.Parsing;
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.parser.block.*;
+
+import java.util.Objects;
+
+public class ListBlockParser extends AbstractBlockParser {
+
+    private final ListBlock block;
+
+    private boolean hadBlankLine;
+    private int linesAfterBlank;
+
+    public ListBlockParser(ListBlock block) {
+        this.block = block;
+    }
+
+    @Override
+    public boolean isContainer() {
+        return true;
+    }
+
+    @Override
+    public boolean canContain(Block childBlock) {
+        if (childBlock instanceof ListItem) {
+            // Another list item is added to this list block. If the previous line was blank, that means this list block
+            // is "loose" (not tight).
+            //
+            // spec: A list is loose if any of its constituent list items are separated by blank lines
+            if (hadBlankLine && linesAfterBlank == 1) {
+                block.setTight(false);
+                hadBlankLine = false;
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        if (state.isBlank()) {
+            hadBlankLine = true;
+            linesAfterBlank = 0;
+        } else if (hadBlankLine) {
+            linesAfterBlank++;
+        }
+        // List blocks themselves don't have any markers, only list items. So try to stay in the list.
+        // If there is a block start other than list item, canContain makes sure that this list is closed.
+        return BlockContinue.atIndex(state.getIndex());
+    }
+
+    /**
+     * Parse a list marker and return data on the marker or null.
+     */
+    private static ListData parseList(CharSequence line, final int markerIndex, final int markerColumn,
+                                      final boolean inParagraph) {
+        ListMarkerData listMarker = parseListMarker(line, markerIndex);
+        if (listMarker == null) {
+            return null;
+        }
+        ListBlock listBlock = listMarker.listBlock;
+
+        int indexAfterMarker = listMarker.indexAfterMarker;
+        int markerLength = indexAfterMarker - markerIndex;
+        // marker doesn't include tabs, so counting them as columns directly is ok
+        int columnAfterMarker = markerColumn + markerLength;
+        // the column within the line where the content starts
+        int contentColumn = columnAfterMarker;
+
+        // See at which column the content starts if there is content
+        boolean hasContent = false;
+        int length = line.length();
+        for (int i = indexAfterMarker; i < length; i++) {
+            char c = line.charAt(i);
+            if (c == '\t') {
+                contentColumn += Parsing.columnsToNextTabStop(contentColumn);
+            } else if (c == ' ') {
+                contentColumn++;
+            } else {
+                hasContent = true;
+                break;
+            }
+        }
+
+        if (inParagraph) {
+            // If the list item is ordered, the start number must be 1 to interrupt a paragraph.
+            if (listBlock instanceof OrderedList && ((OrderedList) listBlock).getMarkerStartNumber() != 1) {
+                return null;
+            }
+            // Empty list item can not interrupt a paragraph.
+            if (!hasContent) {
+                return null;
+            }
+        }
+
+        if (!hasContent || (contentColumn - columnAfterMarker) > Parsing.CODE_BLOCK_INDENT) {
+            // If this line is blank or has a code block, default to 1 space after marker
+            contentColumn = columnAfterMarker + 1;
+        }
+
+        return new ListData(listBlock, contentColumn);
+    }
+
+    private static ListMarkerData parseListMarker(CharSequence line, int index) {
+        char c = line.charAt(index);
+        switch (c) {
+            // spec: A bullet list marker is a -, +, or * character.
+            case '-':
+            case '+':
+            case '*':
+                if (isSpaceTabOrEnd(line, index + 1)) {
+                    BulletList bulletList = new BulletList();
+                    bulletList.setMarker(String.valueOf(c));
+                    return new ListMarkerData(bulletList, index + 1);
+                } else {
+                    return null;
+                }
+            default:
+                return parseOrderedList(line, index);
+        }
+    }
+
+    // spec: An ordered list marker is a sequence of 1\u20139 arabic digits (0-9), followed by either a `.` character or a
+    // `)` character.
+    private static ListMarkerData parseOrderedList(CharSequence line, int index) {
+        int digits = 0;
+        int length = line.length();
+        for (int i = index; i < length; i++) {
+            char c = line.charAt(i);
+            switch (c) {
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9':
+                    digits++;
+                    if (digits > 9) {
+                        return null;
+                    }
+                    break;
+                case '.':
+                case ')':
+                    if (digits >= 1 && isSpaceTabOrEnd(line, i + 1)) {
+                        String number = line.subSequence(index, i).toString();
+                        OrderedList orderedList = new OrderedList();
+                        orderedList.setMarkerStartNumber(Integer.parseInt(number));
+                        orderedList.setMarkerDelimiter(String.valueOf(c));
+                        return new ListMarkerData(orderedList, i + 1);
+                    } else {
+                        return null;
+                    }
+                default:
+                    return null;
+            }
+        }
+        return null;
+    }
+
+    private static boolean isSpaceTabOrEnd(CharSequence line, int index) {
+        if (index < line.length()) {
+            switch (line.charAt(index)) {
+                case ' ':
+                case '\t':
+                    return true;
+                default:
+                    return false;
+            }
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Returns true if the two list items are of the same type,
+     * with the same delimiter and bullet character. This is used
+     * in agglomerating list items into lists.
+     */
+    private static boolean listsMatch(ListBlock a, ListBlock b) {
+        if (a instanceof BulletList && b instanceof BulletList) {
+            return Objects.equals(((BulletList) a).getMarker(), ((BulletList) b).getMarker());
+        } else if (a instanceof OrderedList && b instanceof OrderedList) {
+            return Objects.equals(((OrderedList) a).getMarkerDelimiter(), ((OrderedList) b).getMarkerDelimiter());
+        }
+        return false;
+    }
+
+    public static class Factory extends AbstractBlockParserFactory {
+
+        @Override
+        public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
+            BlockParser matched = matchedBlockParser.getMatchedBlockParser();
+
+            if (state.getIndent() >= Parsing.CODE_BLOCK_INDENT) {
+                return BlockStart.none();
+            }
+            int markerIndex = state.getNextNonSpaceIndex();
+            int markerColumn = state.getColumn() + state.getIndent();
+            boolean inParagraph = !matchedBlockParser.getParagraphLines().isEmpty();
+            ListData listData = parseList(state.getLine().getContent(), markerIndex, markerColumn, inParagraph);
+            if (listData == null) {
+                return BlockStart.none();
+            }
+
+            int newColumn = listData.contentColumn;
+            ListItemParser listItemParser = new ListItemParser(state.getIndent(), newColumn - state.getColumn());
+
+            // prepend the list block if needed
+            if (!(matched instanceof ListBlockParser) ||
+                    !(listsMatch((ListBlock) matched.getBlock(), listData.listBlock))) {
+
+                ListBlockParser listBlockParser = new ListBlockParser(listData.listBlock);
+                // We start out with assuming a list is tight. If we find a blank line, we set it to loose later.
+                listData.listBlock.setTight(true);
+
+                return BlockStart.of(listBlockParser, listItemParser).atColumn(newColumn);
+            } else {
+                return BlockStart.of(listItemParser).atColumn(newColumn);
+            }
+        }
+    }
+
+    private static class ListData {
+        final ListBlock listBlock;
+        final int contentColumn;
+
+        ListData(ListBlock listBlock, int contentColumn) {
+            this.listBlock = listBlock;
+            this.contentColumn = contentColumn;
+        }
+    }
+
+    private static class ListMarkerData {
+        final ListBlock listBlock;
+        final int indexAfterMarker;
+
+        ListMarkerData(ListBlock listBlock, int indexAfterMarker) {
+            this.listBlock = listBlock;
+            this.indexAfterMarker = indexAfterMarker;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ListItemParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ListItemParser.java
new file mode 100644
index 00000000000..e6401deed9f
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ListItemParser.java
@@ -0,0 +1,107 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.ListBlock;
+import jdk.internal.org.commonmark.node.ListItem;
+import jdk.internal.org.commonmark.node.Paragraph;
+import jdk.internal.org.commonmark.parser.block.AbstractBlockParser;
+import jdk.internal.org.commonmark.parser.block.BlockContinue;
+import jdk.internal.org.commonmark.parser.block.ParserState;
+
+public class ListItemParser extends AbstractBlockParser {
+
+    private final ListItem block = new ListItem();
+
+    /**
+     * Minimum number of columns that the content has to be indented (relative to the containing block) to be part of
+     * this list item.
+     */
+    private int contentIndent;
+
+    private boolean hadBlankLine;
+
+    public ListItemParser(int markerIndent, int contentIndent) {
+        this.contentIndent = contentIndent;
+        block.setMarkerIndent(markerIndent);
+        block.setContentIndent(contentIndent);
+    }
+
+    @Override
+    public boolean isContainer() {
+        return true;
+    }
+
+    @Override
+    public boolean canContain(Block childBlock) {
+        if (hadBlankLine) {
+            // We saw a blank line in this list item, that means the list block is loose.
+            //
+            // spec: if any of its constituent list items directly contain two block-level elements with a blank line
+            // between them
+            Block parent = block.getParent();
+            if (parent instanceof ListBlock) {
+                ((ListBlock) parent).setTight(false);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        if (state.isBlank()) {
+            if (block.getFirstChild() == null) {
+                // Blank line after empty list item
+                return BlockContinue.none();
+            } else {
+                Block activeBlock = state.getActiveBlockParser().getBlock();
+                // If the active block is a code block, blank lines in it should not affect if the list is tight.
+                hadBlankLine = activeBlock instanceof Paragraph || activeBlock instanceof ListItem;
+                return BlockContinue.atIndex(state.getNextNonSpaceIndex());
+            }
+        }
+
+        if (state.getIndent() >= contentIndent) {
+            return BlockContinue.atColumn(state.getColumn() + contentIndent);
+        } else {
+            // Note: We'll hit this case for lazy continuation lines, they will get added later.
+            return BlockContinue.none();
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ParagraphParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ParagraphParser.java
new file mode 100644
index 00000000000..7cbc28e2cb2
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ParagraphParser.java
@@ -0,0 +1,108 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.LinkReferenceDefinition;
+import jdk.internal.org.commonmark.node.Paragraph;
+import jdk.internal.org.commonmark.node.SourceSpan;
+import jdk.internal.org.commonmark.parser.InlineParser;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.SourceLines;
+import jdk.internal.org.commonmark.parser.block.AbstractBlockParser;
+import jdk.internal.org.commonmark.parser.block.BlockContinue;
+import jdk.internal.org.commonmark.parser.block.ParserState;
+
+import java.util.List;
+
+public class ParagraphParser extends AbstractBlockParser {
+
+    private final Paragraph block = new Paragraph();
+    private final LinkReferenceDefinitionParser linkReferenceDefinitionParser = new LinkReferenceDefinitionParser();
+
+    @Override
+    public boolean canHaveLazyContinuationLines() {
+        return true;
+    }
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        if (!state.isBlank()) {
+            return BlockContinue.atIndex(state.getIndex());
+        } else {
+            return BlockContinue.none();
+        }
+    }
+
+    @Override
+    public void addLine(SourceLine line) {
+        linkReferenceDefinitionParser.parse(line);
+    }
+
+    @Override
+    public void addSourceSpan(SourceSpan sourceSpan) {
+        // Some source spans might belong to link reference definitions, others to the paragraph.
+        // The parser will handle that.
+        linkReferenceDefinitionParser.addSourceSpan(sourceSpan);
+    }
+
+    @Override
+    public void closeBlock() {
+        if (linkReferenceDefinitionParser.getParagraphLines().isEmpty()) {
+            block.unlink();
+        } else {
+            block.setSourceSpans(linkReferenceDefinitionParser.getParagraphSourceSpans());
+        }
+    }
+
+    @Override
+    public void parseInlines(InlineParser inlineParser) {
+        SourceLines lines = linkReferenceDefinitionParser.getParagraphLines();
+        if (!lines.isEmpty()) {
+            inlineParser.parse(lines, block);
+        }
+    }
+
+    public SourceLines getParagraphLines() {
+        return linkReferenceDefinitionParser.getParagraphLines();
+    }
+
+    public List<LinkReferenceDefinition> getDefinitions() {
+        return linkReferenceDefinitionParser.getDefinitions();
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/StaggeredDelimiterProcessor.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/StaggeredDelimiterProcessor.java
new file mode 100644
index 00000000000..995f9eac270
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/StaggeredDelimiterProcessor.java
@@ -0,0 +1,108 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterProcessor;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterRun;
+
+import java.util.LinkedList;
+import java.util.ListIterator;
+
+/**
+ * An implementation of DelimiterProcessor that dispatches all calls to two or more other DelimiterProcessors
+ * depending on the length of the delimiter run. All child DelimiterProcessors must have different minimum
+ * lengths. A given delimiter run is dispatched to the child with the largest acceptable minimum length. If no
+ * child is applicable, the one with the largest minimum length is chosen.
+ */
+class StaggeredDelimiterProcessor implements DelimiterProcessor {
+
+    private final char delim;
+    private int minLength = 0;
+    private LinkedList<DelimiterProcessor> processors = new LinkedList<>(); // in reverse getMinLength order
+
+    StaggeredDelimiterProcessor(char delim) {
+        this.delim = delim;
+    }
+
+
+    @Override
+    public char getOpeningCharacter() {
+        return delim;
+    }
+
+    @Override
+    public char getClosingCharacter() {
+        return delim;
+    }
+
+    @Override
+    public int getMinLength() {
+        return minLength;
+    }
+
+    void add(DelimiterProcessor dp) {
+        final int len = dp.getMinLength();
+        ListIterator<DelimiterProcessor> it = processors.listIterator();
+        boolean added = false;
+        while (it.hasNext()) {
+            DelimiterProcessor p = it.next();
+            int pLen = p.getMinLength();
+            if (len > pLen) {
+                it.previous();
+                it.add(dp);
+                added = true;
+                break;
+            } else if (len == pLen) {
+                throw new IllegalArgumentException("Cannot add two delimiter processors for char '" + delim + "' and minimum length " + len + "; conflicting processors: " + p + ", " + dp);
+            }
+        }
+        if (!added) {
+            processors.add(dp);
+            this.minLength = len;
+        }
+    }
+
+    private DelimiterProcessor findProcessor(int len) {
+        for (DelimiterProcessor p : processors) {
+            if (p.getMinLength() <= len) {
+                return p;
+            }
+        }
+        return processors.getFirst();
+    }
+
+    @Override
+    public int process(DelimiterRun openingRun, DelimiterRun closingRun) {
+        return findProcessor(openingRun.length()).process(openingRun, closingRun);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ThematicBreakParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ThematicBreakParser.java
new file mode 100644
index 00000000000..ae0abed6d71
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ThematicBreakParser.java
@@ -0,0 +1,107 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.ThematicBreak;
+import jdk.internal.org.commonmark.parser.block.*;
+
+public class ThematicBreakParser extends AbstractBlockParser {
+
+    private final ThematicBreak block = new ThematicBreak();
+
+    public ThematicBreakParser(String literal) {
+        block.setLiteral(literal);
+    }
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        // a horizontal rule can never container > 1 line, so fail to match
+        return BlockContinue.none();
+    }
+
+    public static class Factory extends AbstractBlockParserFactory {
+
+        @Override
+        public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
+            if (state.getIndent() >= 4) {
+                return BlockStart.none();
+            }
+            int nextNonSpace = state.getNextNonSpaceIndex();
+            CharSequence line = state.getLine().getContent();
+            if (isThematicBreak(line, nextNonSpace)) {
+                var literal = String.valueOf(line.subSequence(state.getIndex(), line.length()));
+                return BlockStart.of(new ThematicBreakParser(literal)).atIndex(line.length());
+            } else {
+                return BlockStart.none();
+            }
+        }
+    }
+
+    // spec: A line consisting of 0-3 spaces of indentation, followed by a sequence of three or more matching -, _, or *
+    // characters, each followed optionally by any number of spaces, forms a thematic break.
+    private static boolean isThematicBreak(CharSequence line, int index) {
+        int dashes = 0;
+        int underscores = 0;
+        int asterisks = 0;
+        int length = line.length();
+        for (int i = index; i < length; i++) {
+            switch (line.charAt(i)) {
+                case '-':
+                    dashes++;
+                    break;
+                case '_':
+                    underscores++;
+                    break;
+                case '*':
+                    asterisks++;
+                    break;
+                case ' ':
+                case '\t':
+                    // Allowed, even between markers
+                    break;
+                default:
+                    return false;
+            }
+        }
+
+        return ((dashes >= 3 && underscores == 0 && asterisks == 0) ||
+                (underscores >= 3 && dashes == 0 && asterisks == 0) ||
+                (asterisks >= 3 && dashes == 0 && underscores == 0));
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/AsteriskDelimiterProcessor.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/AsteriskDelimiterProcessor.java
new file mode 100644
index 00000000000..ff205e8bd22
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/AsteriskDelimiterProcessor.java
@@ -0,0 +1,40 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+public class AsteriskDelimiterProcessor extends EmphasisDelimiterProcessor {
+
+    public AsteriskDelimiterProcessor() {
+        super('*');
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/AutolinkInlineParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/AutolinkInlineParser.java
new file mode 100644
index 00000000000..28ce45d9c4c
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/AutolinkInlineParser.java
@@ -0,0 +1,81 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.node.Link;
+import jdk.internal.org.commonmark.node.Text;
+import jdk.internal.org.commonmark.parser.SourceLines;
+import jdk.internal.org.commonmark.parser.beta.Position;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+
+import java.util.regex.Pattern;
+
+/**
+ * Attempt to parse an autolink (URL or email in pointy brackets).
+ */
+public class AutolinkInlineParser implements InlineContentParser {
+
+    private static final Pattern URI = Pattern
+            .compile("^[a-zA-Z][a-zA-Z0-9.+-]{1,31}:[^<>\u0000-\u0020]*$");
+
+    private static final Pattern EMAIL = Pattern
+            .compile("^([a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)$");
+
+    @Override
+    public ParsedInline tryParse(InlineParserState inlineParserState) {
+        Scanner scanner = inlineParserState.scanner();
+        scanner.next();
+        Position textStart = scanner.position();
+        if (scanner.find('>') > 0) {
+            SourceLines textSource = scanner.getSource(textStart, scanner.position());
+            String content = textSource.getContent();
+            scanner.next();
+
+            String destination = null;
+            if (URI.matcher(content).matches()) {
+                destination = content;
+            } else if (EMAIL.matcher(content).matches()) {
+                destination = "mailto:" + content;
+            }
+
+            if (destination != null) {
+                Link link = new Link(destination, null);
+                Text text = new Text(content);
+                text.setSourceSpans(textSource.getSourceSpans());
+                link.appendChild(text);
+                return ParsedInline.of(link, scanner.position());
+            }
+        }
+        return ParsedInline.none();
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/BackslashInlineParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/BackslashInlineParser.java
new file mode 100644
index 00000000000..e18d337ad8a
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/BackslashInlineParser.java
@@ -0,0 +1,67 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.internal.util.Escaping;
+import jdk.internal.org.commonmark.node.HardLineBreak;
+import jdk.internal.org.commonmark.node.Text;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+
+import java.util.regex.Pattern;
+
+/**
+ * Parse a backslash-escaped special character, adding either the escaped  character, a hard line break
+ * (if the backslash is followed by a newline), or a literal backslash to the block's children.
+ */
+public class BackslashInlineParser implements InlineContentParser {
+
+    private static final Pattern ESCAPABLE = Pattern.compile('^' + Escaping.ESCAPABLE);
+
+    @Override
+    public ParsedInline tryParse(InlineParserState inlineParserState) {
+        Scanner scanner = inlineParserState.scanner();
+        // Backslash
+        scanner.next();
+
+        char next = scanner.peek();
+        if (next == '\n') {
+            scanner.next();
+            return ParsedInline.of(new HardLineBreak(), scanner.position());
+        } else if (ESCAPABLE.matcher(String.valueOf(next)).matches()) {
+            scanner.next();
+            return ParsedInline.of(new Text(String.valueOf(next)), scanner.position());
+        } else {
+            return ParsedInline.of(new Text("\\"), scanner.position());
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/BackticksInlineParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/BackticksInlineParser.java
new file mode 100644
index 00000000000..06b80ab3ebd
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/BackticksInlineParser.java
@@ -0,0 +1,82 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.node.Code;
+import jdk.internal.org.commonmark.node.Text;
+import jdk.internal.org.commonmark.parser.SourceLines;
+import jdk.internal.org.commonmark.parser.beta.Position;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+import jdk.internal.org.commonmark.text.Characters;
+
+/**
+ * Attempt to parse backticks, returning either a backtick code span or a literal sequence of backticks.
+ */
+public class BackticksInlineParser implements InlineContentParser {
+
+    @Override
+    public ParsedInline tryParse(InlineParserState inlineParserState) {
+        Scanner scanner = inlineParserState.scanner();
+        Position start = scanner.position();
+        int openingTicks = scanner.matchMultiple('`');
+        Position afterOpening = scanner.position();
+
+        while (scanner.find('`') > 0) {
+            Position beforeClosing = scanner.position();
+            int count = scanner.matchMultiple('`');
+            if (count == openingTicks) {
+                Code node = new Code();
+
+                String content = scanner.getSource(afterOpening, beforeClosing).getContent();
+                content = content.replace('\n', ' ');
+
+                // spec: If the resulting string both begins and ends with a space character, but does not consist
+                // entirely of space characters, a single space character is removed from the front and back.
+                if (content.length() >= 3 &&
+                        content.charAt(0) == ' ' &&
+                        content.charAt(content.length() - 1) == ' ' &&
+                        Characters.hasNonSpace(content)) {
+                    content = content.substring(1, content.length() - 1);
+                }
+
+                node.setLiteral(content);
+                return ParsedInline.of(node, scanner.position());
+            }
+        }
+
+        // If we got here, we didn't find a matching closing backtick sequence.
+        SourceLines source = scanner.getSource(start, afterOpening);
+        Text text = new Text(source.getContent());
+        return ParsedInline.of(text, afterOpening);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/EmphasisDelimiterProcessor.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/EmphasisDelimiterProcessor.java
new file mode 100644
index 00000000000..0a4c3c45140
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/EmphasisDelimiterProcessor.java
@@ -0,0 +1,98 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterProcessor;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterRun;
+
+public abstract class EmphasisDelimiterProcessor implements DelimiterProcessor {
+
+    private final char delimiterChar;
+
+    protected EmphasisDelimiterProcessor(char delimiterChar) {
+        this.delimiterChar = delimiterChar;
+    }
+
+    @Override
+    public char getOpeningCharacter() {
+        return delimiterChar;
+    }
+
+    @Override
+    public char getClosingCharacter() {
+        return delimiterChar;
+    }
+
+    @Override
+    public int getMinLength() {
+        return 1;
+    }
+
+    @Override
+    public int process(DelimiterRun openingRun, DelimiterRun closingRun) {
+        // "multiple of 3" rule for internal delimiter runs
+        if ((openingRun.canClose() || closingRun.canOpen()) &&
+                closingRun.originalLength() % 3 != 0 &&
+                (openingRun.originalLength() + closingRun.originalLength()) % 3 == 0) {
+            return 0;
+        }
+
+        int usedDelimiters;
+        Node emphasis;
+        // calculate actual number of delimiters used from this closer
+        if (openingRun.length() >= 2 && closingRun.length() >= 2) {
+            usedDelimiters = 2;
+            emphasis = new StrongEmphasis(String.valueOf(delimiterChar) + delimiterChar);
+        } else {
+            usedDelimiters = 1;
+            emphasis = new Emphasis(String.valueOf(delimiterChar));
+        }
+
+        SourceSpans sourceSpans = SourceSpans.empty();
+        sourceSpans.addAllFrom(openingRun.getOpeners(usedDelimiters));
+
+        Text opener = openingRun.getOpener();
+        for (Node node : Nodes.between(opener, closingRun.getCloser())) {
+            emphasis.appendChild(node);
+            sourceSpans.addAll(node.getSourceSpans());
+        }
+
+        sourceSpans.addAllFrom(closingRun.getClosers(usedDelimiters));
+
+        emphasis.setSourceSpans(sourceSpans.getSourceSpans());
+        opener.insertAfter(emphasis);
+
+        return usedDelimiters;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/EntityInlineParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/EntityInlineParser.java
new file mode 100644
index 00000000000..cf4e3d2004b
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/EntityInlineParser.java
@@ -0,0 +1,87 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.text.AsciiMatcher;
+import jdk.internal.org.commonmark.internal.util.Html5Entities;
+import jdk.internal.org.commonmark.node.Text;
+import jdk.internal.org.commonmark.parser.beta.Position;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+
+/**
+ * Attempts to parse a HTML entity or numeric character reference.
+ */
+public class EntityInlineParser implements InlineContentParser {
+
+    private static final AsciiMatcher hex = AsciiMatcher.builder().range('0', '9').range('A', 'F').range('a', 'f').build();
+    private static final AsciiMatcher dec = AsciiMatcher.builder().range('0', '9').build();
+    private static final AsciiMatcher entityStart = AsciiMatcher.builder().range('A', 'Z').range('a', 'z').build();
+    private static final AsciiMatcher entityContinue = entityStart.newBuilder().range('0', '9').build();
+
+    @Override
+    public ParsedInline tryParse(InlineParserState inlineParserState) {
+        Scanner scanner = inlineParserState.scanner();
+        Position start = scanner.position();
+        // Skip `&`
+        scanner.next();
+
+        char c = scanner.peek();
+        if (c == '#') {
+            // Numeric
+            scanner.next();
+            if (scanner.next('x') || scanner.next('X')) {
+                int digits = scanner.match(hex);
+                if (1 <= digits && digits <= 6 && scanner.next(';')) {
+                    return entity(scanner, start);
+                }
+            } else {
+                int digits = scanner.match(dec);
+                if (1 <= digits && digits <= 7 && scanner.next(';')) {
+                    return entity(scanner, start);
+                }
+            }
+        } else if (entityStart.matches(c)) {
+            scanner.match(entityContinue);
+            if (scanner.next(';')) {
+                return entity(scanner, start);
+            }
+        }
+
+        return ParsedInline.none();
+    }
+
+    private ParsedInline entity(Scanner scanner, Position start) {
+        String text = scanner.getSource(start, scanner.position()).getContent();
+        return ParsedInline.of(new Text(Html5Entities.entityToString(text)), scanner.position());
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/HtmlInlineParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/HtmlInlineParser.java
new file mode 100644
index 00000000000..88f4baa2275
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/HtmlInlineParser.java
@@ -0,0 +1,235 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.text.AsciiMatcher;
+import jdk.internal.org.commonmark.node.HtmlInline;
+import jdk.internal.org.commonmark.parser.beta.Position;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+
+/**
+ * Attempt to parse inline HTML.
+ */
+public class HtmlInlineParser implements InlineContentParser {
+
+    private static final AsciiMatcher asciiLetter = AsciiMatcher.builder().range('A', 'Z').range('a', 'z').build();
+
+    // spec: A tag name consists of an ASCII letter followed by zero or more ASCII letters, digits, or hyphens (-).
+    private static final AsciiMatcher tagNameStart = asciiLetter;
+    private static final AsciiMatcher tagNameContinue = tagNameStart.newBuilder().range('0', '9').c('-').build();
+
+    // spec: An attribute name consists of an ASCII letter, _, or :, followed by zero or more ASCII letters, digits,
+    // _, ., :, or -. (Note: This is the XML specification restricted to ASCII. HTML5 is laxer.)
+    private static final AsciiMatcher attributeStart = asciiLetter.newBuilder().c('_').c(':').build();
+    private static final AsciiMatcher attributeContinue = attributeStart.newBuilder().range('0', '9').c('.').c('-').build();
+    // spec: An unquoted attribute value is a nonempty string of characters not including whitespace, ", ', =, <, >, or `.
+    private static final AsciiMatcher attributeValueEnd = AsciiMatcher.builder()
+            .c(' ').c('\t').c('\n').c('\u000B').c('\f').c('\r')
+            .c('"').c('\'').c('=').c('<').c('>').c('`')
+            .build();
+
+    @Override
+    public ParsedInline tryParse(InlineParserState inlineParserState) {
+        Scanner scanner = inlineParserState.scanner();
+        Position start = scanner.position();
+        // Skip over `<`
+        scanner.next();
+
+        char c = scanner.peek();
+        if (tagNameStart.matches(c)) {
+            if (tryOpenTag(scanner)) {
+                return htmlInline(start, scanner);
+            }
+        } else if (c == '/') {
+            if (tryClosingTag(scanner)) {
+                return htmlInline(start, scanner);
+            }
+        } else if (c == '?') {
+            if (tryProcessingInstruction(scanner)) {
+                return htmlInline(start, scanner);
+            }
+        } else if (c == '!') {
+            // comment, declaration or CDATA
+            scanner.next();
+            c = scanner.peek();
+            if (c == '-') {
+                if (tryComment(scanner)) {
+                    return htmlInline(start, scanner);
+                }
+            } else if (c == '[') {
+                if (tryCdata(scanner)) {
+                    return htmlInline(start, scanner);
+                }
+            } else if (asciiLetter.matches(c)) {
+                if (tryDeclaration(scanner)) {
+                    return htmlInline(start, scanner);
+                }
+            }
+        }
+
+        return ParsedInline.none();
+    }
+
+    private static ParsedInline htmlInline(Position start, Scanner scanner) {
+        String text = scanner.getSource(start, scanner.position()).getContent();
+        HtmlInline node = new HtmlInline();
+        node.setLiteral(text);
+        return ParsedInline.of(node, scanner.position());
+    }
+
+    private static boolean tryOpenTag(Scanner scanner) {
+        // spec: An open tag consists of a < character, a tag name, zero or more attributes, optional whitespace,
+        // an optional / character, and a > character.
+        scanner.next();
+        scanner.match(tagNameContinue);
+        boolean whitespace = scanner.whitespace() >= 1;
+        // spec: An attribute consists of whitespace, an attribute name, and an optional attribute value specification.
+        while (whitespace && scanner.match(attributeStart) >= 1) {
+            scanner.match(attributeContinue);
+            // spec: An attribute value specification consists of optional whitespace, a = character,
+            // optional whitespace, and an attribute value.
+            whitespace = scanner.whitespace() >= 1;
+            if (scanner.next('=')) {
+                scanner.whitespace();
+                char valueStart = scanner.peek();
+                if (valueStart == '\'') {
+                    scanner.next();
+                    if (scanner.find('\'') < 0) {
+                        return false;
+                    }
+                    scanner.next();
+                } else if (valueStart == '"') {
+                    scanner.next();
+                    if (scanner.find('"') < 0) {
+                        return false;
+                    }
+                    scanner.next();
+                } else {
+                    if (scanner.find(attributeValueEnd) <= 0) {
+                        return false;
+                    }
+                }
+
+                // Whitespace is required between attributes
+                whitespace = scanner.whitespace() >= 1;
+            }
+        }
+
+        scanner.next('/');
+        return scanner.next('>');
+    }
+
+    private static boolean tryClosingTag(Scanner scanner) {
+        // spec: A closing tag consists of the string </, a tag name, optional whitespace, and the character >.
+        scanner.next();
+        if (scanner.match(tagNameStart) >= 1) {
+            scanner.match(tagNameContinue);
+            scanner.whitespace();
+            return scanner.next('>');
+        }
+        return false;
+    }
+
+    private static boolean tryProcessingInstruction(Scanner scanner) {
+        // spec: A processing instruction consists of the string <?, a string of characters not including the string ?>,
+        // and the string ?>.
+        scanner.next();
+        while (scanner.find('?') > 0) {
+            scanner.next();
+            if (scanner.next('>')) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static boolean tryComment(Scanner scanner) {
+        // spec: An [HTML comment](@) consists of `<!-->`, `<!--->`, or  `<!--`, a string of
+        // characters not including the string `-->`, and `-->` (see the
+        // [HTML spec](https://html.spec.whatwg.org/multipage/parsing.html#markup-declaration-open-state)).
+
+        // Skip first `-`
+        scanner.next();
+        if (!scanner.next('-')) {
+            return false;
+        }
+
+        if (scanner.next('>') || scanner.next("->")) {
+            return true;
+        }
+
+        while (scanner.find('-') >= 0) {
+            if (scanner.next("-->")) {
+                return true;
+            } else {
+                scanner.next();
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean tryCdata(Scanner scanner) {
+        // spec: A CDATA section consists of the string <![CDATA[, a string of characters not including the string ]]>,
+        // and the string ]]>.
+
+        // Skip `[`
+        scanner.next();
+
+        if (scanner.next("CDATA[")) {
+            while (scanner.find(']') >= 0) {
+                if (scanner.next("]]>")) {
+                    return true;
+                } else {
+                    scanner.next();
+                }
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean tryDeclaration(Scanner scanner) {
+        // spec: A declaration consists of the string <!, an ASCII letter, zero or more characters not including
+        // the character >, and the character >.
+        scanner.match(asciiLetter);
+        if (scanner.whitespace() <= 0) {
+            return false;
+        }
+        if (scanner.find('>') >= 0) {
+            scanner.next();
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/InlineContentParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/InlineContentParser.java
new file mode 100644
index 00000000000..66feff21784
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/InlineContentParser.java
@@ -0,0 +1,38 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+public interface InlineContentParser {
+
+    ParsedInline tryParse(InlineParserState inlineParserState);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/InlineParserState.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/InlineParserState.java
new file mode 100644
index 00000000000..6890364fca0
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/InlineParserState.java
@@ -0,0 +1,48 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.parser.beta.Position;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+
+public interface InlineParserState {
+
+    /**
+     * Return a scanner for the input for the current position (on the character that the inline parser registered
+     * interest for).
+     * <p>
+     * Note that this always returns the same instance, if you want to backtrack you need to use
+     * {@link Scanner#position()} and {@link Scanner#setPosition(Position)}.
+     */
+    Scanner scanner();
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/ParsedInline.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/ParsedInline.java
new file mode 100644
index 00000000000..2aed7db83d0
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/ParsedInline.java
@@ -0,0 +1,56 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.parser.beta.Position;
+
+public abstract class ParsedInline {
+
+    protected ParsedInline() {
+    }
+
+    public static ParsedInline none() {
+        return null;
+    }
+
+    public static ParsedInline of(Node node, Position position) {
+        if (node == null) {
+            throw new NullPointerException("node must not be null");
+        }
+        if (position == null) {
+            throw new NullPointerException("position must not be null");
+        }
+        return new ParsedInlineImpl(node, position);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/ParsedInlineImpl.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/ParsedInlineImpl.java
new file mode 100644
index 00000000000..973149a83b4
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/ParsedInlineImpl.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.parser.beta.Position;
+
+public class ParsedInlineImpl extends ParsedInline {
+    private final Node node;
+    private final Position position;
+
+    ParsedInlineImpl(Node node, Position position) {
+        this.node = node;
+        this.position = position;
+    }
+
+    public Node getNode() {
+        return node;
+    }
+
+    public Position getPosition() {
+        return position;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/Position.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/Position.java
new file mode 100644
index 00000000000..fa3767083e3
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/Position.java
@@ -0,0 +1,48 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+/**
+ * Position within a {@link Scanner}. This is intentionally kept opaque so as not to expose the internal structure of
+ * the Scanner.
+ */
+public class Position {
+
+    final int lineIndex;
+    final int index;
+
+    Position(int lineIndex, int index) {
+        this.lineIndex = lineIndex;
+        this.index = index;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/Scanner.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/Scanner.java
new file mode 100644
index 00000000000..a32d0564f7d
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/Scanner.java
@@ -0,0 +1,313 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.internal.util.CharMatcher;
+import jdk.internal.org.commonmark.node.SourceSpan;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.SourceLines;
+
+import java.util.List;
+
+public class Scanner {
+
+    /**
+     * Character representing the end of input source (or outside of the text in case of the "previous" methods).
+     * <p>
+     * Note that we can use NULL to represent this because CommonMark does not allow those in the input (we replace them
+     * in the beginning of parsing).
+     */
+    public static final char END = '\0';
+
+    // Lines without newlines at the end. The scanner will yield `\n` between lines because they're significant for
+    // parsing and the final output. There is no `\n` after the last line.
+    private final List<SourceLine> lines;
+    // Which line we're at.
+    private int lineIndex;
+    // The index within the line. If index == length(), we pretend that there's a `\n` and only advance after we yield
+    // that.
+    private int index;
+
+    // Current line or "" if at the end of the lines (using "" instead of null saves a null check)
+    private SourceLine line = SourceLine.of("", null);
+    private int lineLength = 0;
+
+    Scanner(List<SourceLine> lines, int lineIndex, int index) {
+        this.lines = lines;
+        this.lineIndex = lineIndex;
+        this.index = index;
+        if (!lines.isEmpty()) {
+            checkPosition(lineIndex, index);
+            setLine(lines.get(lineIndex));
+        }
+    }
+
+    public static Scanner of(SourceLines lines) {
+        return new Scanner(lines.getLines(), 0, 0);
+    }
+
+    public char peek() {
+        if (index < lineLength) {
+            return line.getContent().charAt(index);
+        } else {
+            if (lineIndex < lines.size() - 1) {
+                return '\n';
+            } else {
+                // Don't return newline for end of last line
+                return END;
+            }
+        }
+    }
+
+    public int peekCodePoint() {
+        if (index < lineLength) {
+            char c = line.getContent().charAt(index);
+            if (Character.isHighSurrogate(c) && index + 1 < lineLength) {
+                char low = line.getContent().charAt(index + 1);
+                if (Character.isLowSurrogate(low)) {
+                    return Character.toCodePoint(c, low);
+                }
+            }
+            return c;
+        } else {
+            if (lineIndex < lines.size() - 1) {
+                return '\n';
+            } else {
+                // Don't return newline for end of last line
+                return END;
+            }
+        }
+    }
+
+    public int peekPreviousCodePoint() {
+        if (index > 0) {
+            int prev = index - 1;
+            char c = line.getContent().charAt(prev);
+            if (Character.isLowSurrogate(c) && prev > 0) {
+                char high = line.getContent().charAt(prev - 1);
+                if (Character.isHighSurrogate(high)) {
+                    return Character.toCodePoint(high, c);
+                }
+            }
+            return c;
+        } else {
+            if (lineIndex > 0) {
+                return '\n';
+            } else {
+                return END;
+            }
+        }
+    }
+
+    public boolean hasNext() {
+        if (index < lineLength) {
+            return true;
+        } else {
+            // No newline at end of last line
+            return lineIndex < lines.size() - 1;
+        }
+    }
+
+    public void next() {
+        index++;
+        if (index > lineLength) {
+            lineIndex++;
+            if (lineIndex < lines.size()) {
+                setLine(lines.get(lineIndex));
+            } else {
+                setLine(SourceLine.of("", null));
+            }
+            index = 0;
+        }
+    }
+
+    /**
+     * Check if the specified char is next and advance the position.
+     *
+     * @param c the char to check (including newline characters)
+     * @return true if matched and position was advanced, false otherwise
+     */
+    public boolean next(char c) {
+        if (peek() == c) {
+            next();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Check if we have the specified content on the line and advanced the position. Note that if you want to match
+     * newline characters, use {@link #next(char)}.
+     *
+     * @param content the text content to match on a single line (excluding newline characters)
+     * @return true if matched and position was advanced, false otherwise
+     */
+    public boolean next(String content) {
+        if (index < lineLength && index + content.length() <= lineLength) {
+            // Can't use startsWith because it's not available on CharSequence
+            for (int i = 0; i < content.length(); i++) {
+                if (line.getContent().charAt(index + i) != content.charAt(i)) {
+                    return false;
+                }
+            }
+            index += content.length();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public int matchMultiple(char c) {
+        int count = 0;
+        while (peek() == c) {
+            count++;
+            next();
+        }
+        return count;
+    }
+
+    public int match(CharMatcher matcher) {
+        int count = 0;
+        while (matcher.matches(peek())) {
+            count++;
+            next();
+        }
+        return count;
+    }
+
+    public int whitespace() {
+        int count = 0;
+        while (true) {
+            switch (peek()) {
+                case ' ':
+                case '\t':
+                case '\n':
+                case '\u000B':
+                case '\f':
+                case '\r':
+                    count++;
+                    next();
+                    break;
+                default:
+                    return count;
+            }
+        }
+    }
+
+    public int find(char c) {
+        int count = 0;
+        while (true) {
+            char cur = peek();
+            if (cur == Scanner.END) {
+                return -1;
+            } else if (cur == c) {
+                return count;
+            }
+            count++;
+            next();
+        }
+    }
+
+    public int find(CharMatcher matcher) {
+        int count = 0;
+        while (true) {
+            char c = peek();
+            if (c == END) {
+                return -1;
+            } else if (matcher.matches(c)) {
+                return count;
+            }
+            count++;
+            next();
+        }
+    }
+
+    // Don't expose the int index, because it would be good if we could switch input to a List<String> of lines later
+    // instead of one contiguous String.
+    public Position position() {
+        return new Position(lineIndex, index);
+    }
+
+    public void setPosition(Position position) {
+        checkPosition(position.lineIndex, position.index);
+        this.lineIndex = position.lineIndex;
+        this.index = position.index;
+        setLine(lines.get(this.lineIndex));
+    }
+
+    // For cases where the caller appends the result to a StringBuilder, we could offer another method to avoid some
+    // unnecessary copying.
+    public SourceLines getSource(Position begin, Position end) {
+        if (begin.lineIndex == end.lineIndex) {
+            // Shortcut for common case of text from a single line
+            SourceLine line = lines.get(begin.lineIndex);
+            CharSequence newContent = line.getContent().subSequence(begin.index, end.index);
+            SourceSpan newSourceSpan = null;
+            SourceSpan sourceSpan = line.getSourceSpan();
+            if (sourceSpan != null) {
+                newSourceSpan = SourceSpan.of(sourceSpan.getLineIndex(), sourceSpan.getColumnIndex() + begin.index, newContent.length());
+            }
+            return SourceLines.of(SourceLine.of(newContent, newSourceSpan));
+        } else {
+            SourceLines sourceLines = SourceLines.empty();
+
+            SourceLine firstLine = lines.get(begin.lineIndex);
+            sourceLines.addLine(firstLine.substring(begin.index, firstLine.getContent().length()));
+
+            // Lines between begin and end (we are appending the full line)
+            for (int line = begin.lineIndex + 1; line < end.lineIndex; line++) {
+                sourceLines.addLine(lines.get(line));
+            }
+
+            SourceLine lastLine = lines.get(end.lineIndex);
+            sourceLines.addLine(lastLine.substring(0, end.index));
+            return sourceLines;
+        }
+    }
+
+    private void setLine(SourceLine line) {
+        this.line = line;
+        this.lineLength = line.getContent().length();
+    }
+
+    private void checkPosition(int lineIndex, int index) {
+        if (lineIndex < 0 || lineIndex >= lines.size()) {
+            throw new IllegalArgumentException("Line index " + lineIndex + " out of range, number of lines: " + lines.size());
+        }
+        SourceLine line = lines.get(lineIndex);
+        if (index < 0 || index > line.getContent().length()) {
+            throw new IllegalArgumentException("Index " + index + " out of range, line length: " + line.getContent().length());
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/UnderscoreDelimiterProcessor.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/UnderscoreDelimiterProcessor.java
new file mode 100644
index 00000000000..be297441d97
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/UnderscoreDelimiterProcessor.java
@@ -0,0 +1,40 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+public class UnderscoreDelimiterProcessor extends EmphasisDelimiterProcessor {
+
+    public UnderscoreDelimiterProcessor() {
+        super('_');
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/NodeRendererMap.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/NodeRendererMap.java
new file mode 100644
index 00000000000..523609f21de
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/NodeRendererMap.java
@@ -0,0 +1,58 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.renderer;
+
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class NodeRendererMap {
+
+    private final Map<Class<? extends Node>, NodeRenderer> renderers = new HashMap<>(32);
+
+    public void add(NodeRenderer nodeRenderer) {
+        for (Class<? extends Node> nodeType : nodeRenderer.getNodeTypes()) {
+            // Overwrite existing renderer
+            renderers.put(nodeType, nodeRenderer);
+        }
+    }
+
+    public void render(Node node) {
+        NodeRenderer nodeRenderer = renderers.get(node.getClass());
+        if (nodeRenderer != null) {
+            nodeRenderer.render(node);
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/BulletListHolder.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/BulletListHolder.java
new file mode 100644
index 00000000000..154bad58278
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/BulletListHolder.java
@@ -0,0 +1,48 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.renderer.text;
+
+import jdk.internal.org.commonmark.node.BulletList;
+
+public class BulletListHolder extends ListHolder {
+    private final String marker;
+
+    public BulletListHolder(ListHolder parent, BulletList list) {
+        super(parent);
+        marker = list.getMarker();
+    }
+
+    public String getMarker() {
+        return marker;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/ListHolder.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/ListHolder.java
new file mode 100644
index 00000000000..6334f4cffad
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/ListHolder.java
@@ -0,0 +1,59 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.renderer.text;
+
+public abstract class ListHolder {
+    private static final String INDENT_DEFAULT = "   ";
+    private static final String INDENT_EMPTY = "";
+
+    private final ListHolder parent;
+    private final String indent;
+
+    ListHolder(ListHolder parent) {
+        this.parent = parent;
+
+        if (parent != null) {
+            indent = parent.indent + INDENT_DEFAULT;
+        } else {
+            indent = INDENT_EMPTY;
+        }
+    }
+
+    public ListHolder getParent() {
+        return parent;
+    }
+
+    public String getIndent() {
+        return indent;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/OrderedListHolder.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/OrderedListHolder.java
new file mode 100644
index 00000000000..114c4dfeb29
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/OrderedListHolder.java
@@ -0,0 +1,58 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.renderer.text;
+
+import jdk.internal.org.commonmark.node.OrderedList;
+
+public class OrderedListHolder extends ListHolder {
+    private final String delimiter;
+    private int counter;
+
+    public OrderedListHolder(ListHolder parent, OrderedList list) {
+        super(parent);
+        delimiter = list.getMarkerDelimiter() != null ? list.getMarkerDelimiter() : ".";
+        counter = list.getMarkerStartNumber() != null ? list.getMarkerStartNumber() : 1;
+    }
+
+    public String getDelimiter() {
+        return delimiter;
+    }
+
+    public int getCounter() {
+        return counter;
+    }
+
+    public void increaseCounter() {
+        counter++;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/AsciiMatcher.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/AsciiMatcher.java
new file mode 100644
index 00000000000..915c3078b7a
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/AsciiMatcher.java
@@ -0,0 +1,83 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.util;
+
+import java.util.BitSet;
+
+public class AsciiMatcher implements CharMatcher {
+    private final BitSet set;
+
+    private AsciiMatcher(Builder builder) {
+        this.set = builder.set;
+    }
+
+    @Override
+    public boolean matches(char c) {
+        return set.get(c);
+    }
+
+    public Builder newBuilder() {
+        return new Builder((BitSet) set.clone());
+    }
+
+    public static Builder builder() {
+        return new Builder(new BitSet());
+    }
+
+    public static class Builder {
+        private final BitSet set;
+
+        private Builder(BitSet set) {
+            this.set = set;
+        }
+
+        public Builder c(char c) {
+            if (c > 127) {
+                throw new IllegalArgumentException("Can only match ASCII characters");
+            }
+            set.set(c);
+            return this;
+        }
+
+        public Builder range(char from, char toInclusive) {
+            for (char c = from; c <= toInclusive; c++) {
+                c(c);
+            }
+            return this;
+        }
+
+        public AsciiMatcher build() {
+            return new AsciiMatcher(this);
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/CharMatcher.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/CharMatcher.java
new file mode 100644
index 00000000000..e74cb314ff3
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/CharMatcher.java
@@ -0,0 +1,38 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.util;
+
+public interface CharMatcher {
+
+    boolean matches(char c);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Escaping.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Escaping.java
new file mode 100644
index 00000000000..939a4c69860
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Escaping.java
@@ -0,0 +1,183 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.util;
+
+import java.nio.charset.Charset;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class Escaping {
+
+    public static final String ESCAPABLE = "[!\"#$%&\'()*+,./:;<=>?@\\[\\\\\\]^_`{|}~-]";
+
+    public static final String ENTITY = "&(?:#x[a-f0-9]{1,6}|#[0-9]{1,7}|[a-z][a-z0-9]{1,31});";
+
+    private static final Pattern BACKSLASH_OR_AMP = Pattern.compile("[\\\\&]");
+
+    private static final Pattern ENTITY_OR_ESCAPED_CHAR =
+            Pattern.compile("\\\\" + ESCAPABLE + '|' + ENTITY, Pattern.CASE_INSENSITIVE);
+
+    // From RFC 3986 (see "reserved", "unreserved") except don't escape '[' or ']' to be compatible with JS encodeURI
+    private static final Pattern ESCAPE_IN_URI =
+            Pattern.compile("(%[a-fA-F0-9]{0,2}|[^:/?#@!$&'()*+,;=a-zA-Z0-9\\-._~])");
+
+    private static final char[] HEX_DIGITS =
+            new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+    private static final Pattern WHITESPACE = Pattern.compile("[ \t\r\n]+");
+
+    private static final Replacer UNESCAPE_REPLACER = new Replacer() {
+        @Override
+        public void replace(String input, StringBuilder sb) {
+            if (input.charAt(0) == '\\') {
+                sb.append(input, 1, input.length());
+            } else {
+                sb.append(Html5Entities.entityToString(input));
+            }
+        }
+    };
+
+    private static final Replacer URI_REPLACER = new Replacer() {
+        @Override
+        public void replace(String input, StringBuilder sb) {
+            if (input.startsWith("%")) {
+                if (input.length() == 3) {
+                    // Already percent-encoded, preserve
+                    sb.append(input);
+                } else {
+                    // %25 is the percent-encoding for %
+                    sb.append("%25");
+                    sb.append(input, 1, input.length());
+                }
+            } else {
+                byte[] bytes = input.getBytes(Charset.forName("UTF-8"));
+                for (byte b : bytes) {
+                    sb.append('%');
+                    sb.append(HEX_DIGITS[(b >> 4) & 0xF]);
+                    sb.append(HEX_DIGITS[b & 0xF]);
+                }
+            }
+        }
+    };
+
+    public static String escapeHtml(String input) {
+        // Avoid building a new string in the majority of cases (nothing to escape)
+        StringBuilder sb = null;
+
+        loop:
+        for (int i = 0; i < input.length(); i++) {
+            char c = input.charAt(i);
+            String replacement;
+            switch (c) {
+                case '&':
+                    replacement = "&amp;";
+                    break;
+                case '<':
+                    replacement = "&lt;";
+                    break;
+                case '>':
+                    replacement = "&gt;";
+                    break;
+                case '\"':
+                    replacement = "&quot;";
+                    break;
+                default:
+                    if (sb != null) {
+                        sb.append(c);
+                    }
+                    continue loop;
+            }
+            if (sb == null) {
+                sb = new StringBuilder();
+                sb.append(input, 0, i);
+            }
+            sb.append(replacement);
+        }
+
+        return sb != null ? sb.toString() : input;
+    }
+
+    /**
+     * Replace entities and backslash escapes with literal characters.
+     */
+    public static String unescapeString(String s) {
+        if (BACKSLASH_OR_AMP.matcher(s).find()) {
+            return replaceAll(ENTITY_OR_ESCAPED_CHAR, s, UNESCAPE_REPLACER);
+        } else {
+            return s;
+        }
+    }
+
+    public static String percentEncodeUrl(String s) {
+        return replaceAll(ESCAPE_IN_URI, s, URI_REPLACER);
+    }
+
+    public static String normalizeLabelContent(String input) {
+        String trimmed = input.trim();
+
+        // This is necessary to correctly case fold "\u1e9e" to "SS":
+        // "\u1e9e".toLowerCase(Locale.ROOT)  -> "\u00df"
+        // "\u00df".toUpperCase(Locale.ROOT)  -> "SS"
+        // Note that doing upper first (or only upper without lower) wouldn't work because:
+        // "\u1e9e".toUpperCase(Locale.ROOT)  -> "\u1e9e"
+        String caseFolded = trimmed.toLowerCase(Locale.ROOT).toUpperCase(Locale.ROOT);
+
+        return WHITESPACE.matcher(caseFolded).replaceAll(" ");
+    }
+
+    private static String replaceAll(Pattern p, String s, Replacer replacer) {
+        Matcher matcher = p.matcher(s);
+
+        if (!matcher.find()) {
+            return s;
+        }
+
+        StringBuilder sb = new StringBuilder(s.length() + 16);
+        int lastEnd = 0;
+        do {
+            sb.append(s, lastEnd, matcher.start());
+            replacer.replace(matcher.group(), sb);
+            lastEnd = matcher.end();
+        } while (matcher.find());
+
+        if (lastEnd != s.length()) {
+            sb.append(s, lastEnd, s.length());
+        }
+        return sb.toString();
+    }
+
+    private interface Replacer {
+        void replace(String input, StringBuilder sb);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Html5Entities.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Html5Entities.java
new file mode 100644
index 00000000000..6dcb66c058d
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Html5Entities.java
@@ -0,0 +1,103 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.util;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Html5Entities {
+
+    private static final Map<String, String> NAMED_CHARACTER_REFERENCES = readEntities();
+    private static final String ENTITY_PATH = "/jdk/internal/org/commonmark/internal/util/entities.txt";
+
+    public static String entityToString(String input) {
+        if (!input.startsWith("&") || !input.endsWith(";")) {
+            return input;
+        }
+
+        String value = input.substring(1, input.length() - 1);
+        if (value.startsWith("#")) {
+            value = value.substring(1);
+            int base = 10;
+            if (value.startsWith("x") || value.startsWith("X")) {
+                value = value.substring(1);
+                base = 16;
+            }
+
+            try {
+                int codePoint = Integer.parseInt(value, base);
+                if (codePoint == 0) {
+                    return "\uFFFD";
+                }
+                return new String(Character.toChars(codePoint));
+            } catch (IllegalArgumentException e) {
+                return "\uFFFD";
+            }
+        } else {
+            String s = NAMED_CHARACTER_REFERENCES.get(value);
+            if (s != null) {
+                return s;
+            } else {
+                return input;
+            }
+        }
+    }
+
+    private static Map<String, String> readEntities() {
+        Map<String, String> entities = new HashMap<>();
+        InputStream stream = Html5Entities.class.getResourceAsStream(ENTITY_PATH);
+        Charset charset = StandardCharsets.UTF_8;
+        try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(stream, charset))) {
+            String line;
+            while ((line = bufferedReader.readLine()) != null) {
+                if (line.length() == 0) {
+                    continue;
+                }
+                int equal = line.indexOf("=");
+                String key = line.substring(0, equal);
+                String value = line.substring(equal + 1);
+                entities.put(key, value);
+            }
+        } catch (IOException e) {
+            throw new IllegalStateException("Failed reading data for HTML named character references", e);
+        }
+        entities.put("NewLine", "\n");
+        return entities;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/LinkScanner.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/LinkScanner.java
new file mode 100644
index 00000000000..b3f80c173d1
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/LinkScanner.java
@@ -0,0 +1,234 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.util;
+
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+
+public class LinkScanner {
+
+    /**
+     * Attempt to scan the contents of a link label (inside the brackets), stopping after the content or returning false.
+     * The stopped position can bei either the closing {@code ]}, or the end of the line if the label continues on
+     * the next line.
+     */
+    public static boolean scanLinkLabelContent(Scanner scanner) {
+        while (scanner.hasNext()) {
+            switch (scanner.peek()) {
+                case '\\':
+                    scanner.next();
+                    if (isEscapable(scanner.peek())) {
+                        scanner.next();
+                    }
+                    break;
+                case ']':
+                    return true;
+                case '[':
+                    // spec: Unescaped square bracket characters are not allowed inside the opening and closing
+                    // square brackets of link labels.
+                    return false;
+                default:
+                    scanner.next();
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Attempt to scan a link destination, stopping after the destination or returning false.
+     */
+    public static boolean scanLinkDestination(Scanner scanner) {
+        if (!scanner.hasNext()) {
+            return false;
+        }
+
+        if (scanner.next('<')) {
+            while (scanner.hasNext()) {
+                switch (scanner.peek()) {
+                    case '\\':
+                        scanner.next();
+                        if (isEscapable(scanner.peek())) {
+                            scanner.next();
+                        }
+                        break;
+                    case '\n':
+                    case '<':
+                        return false;
+                    case '>':
+                        scanner.next();
+                        return true;
+                    default:
+                        scanner.next();
+                }
+            }
+            return false;
+        } else {
+            return scanLinkDestinationWithBalancedParens(scanner);
+        }
+    }
+
+    public static boolean scanLinkTitle(Scanner scanner) {
+        if (!scanner.hasNext()) {
+            return false;
+        }
+
+        char endDelimiter;
+        switch (scanner.peek()) {
+            case '"':
+                endDelimiter = '"';
+                break;
+            case '\'':
+                endDelimiter = '\'';
+                break;
+            case '(':
+                endDelimiter = ')';
+                break;
+            default:
+                return false;
+        }
+        scanner.next();
+
+        if (!scanLinkTitleContent(scanner, endDelimiter)) {
+            return false;
+        }
+        if (!scanner.hasNext()) {
+            return false;
+        }
+        scanner.next();
+        return true;
+    }
+
+    public static boolean scanLinkTitleContent(Scanner scanner, char endDelimiter) {
+        while (scanner.hasNext()) {
+            char c = scanner.peek();
+            if (c == '\\') {
+                scanner.next();
+                if (isEscapable(scanner.peek())) {
+                    scanner.next();
+                }
+            } else if (c == endDelimiter) {
+                return true;
+            } else if (endDelimiter == ')' && c == '(') {
+                // unescaped '(' in title within parens is invalid
+                return false;
+            } else {
+                scanner.next();
+            }
+        }
+        return true;
+    }
+
+    // spec: a nonempty sequence of characters that does not start with <, does not include ASCII space or control
+    // characters, and includes parentheses only if (a) they are backslash-escaped or (b) they are part of a balanced
+    // pair of unescaped parentheses
+    private static boolean scanLinkDestinationWithBalancedParens(Scanner scanner) {
+        int parens = 0;
+        boolean empty = true;
+        while (scanner.hasNext()) {
+            char c = scanner.peek();
+            switch (c) {
+                case ' ':
+                    return !empty;
+                case '\\':
+                    scanner.next();
+                    if (isEscapable(scanner.peek())) {
+                        scanner.next();
+                    }
+                    break;
+                case '(':
+                    parens++;
+                    // Limit to 32 nested parens for pathological cases
+                    if (parens > 32) {
+                        return false;
+                    }
+                    scanner.next();
+                    break;
+                case ')':
+                    if (parens == 0) {
+                        return true;
+                    } else {
+                        parens--;
+                    }
+                    scanner.next();
+                    break;
+                default:
+                    // or control character
+                    if (Character.isISOControl(c)) {
+                        return !empty;
+                    }
+                    scanner.next();
+                    break;
+            }
+            empty = false;
+        }
+        return true;
+    }
+
+    private static boolean isEscapable(char c) {
+        switch (c) {
+            case '!':
+            case '"':
+            case '#':
+            case '$':
+            case '%':
+            case '&':
+            case '\'':
+            case '(':
+            case ')':
+            case '*':
+            case '+':
+            case ',':
+            case '-':
+            case '.':
+            case '/':
+            case ':':
+            case ';':
+            case '<':
+            case '=':
+            case '>':
+            case '?':
+            case '@':
+            case '[':
+            case '\\':
+            case ']':
+            case '^':
+            case '_':
+            case '`':
+            case '{':
+            case '|':
+            case '}':
+            case '~':
+                return true;
+        }
+        return false;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Parsing.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Parsing.java
new file mode 100644
index 00000000000..34c8cf89ac6
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Parsing.java
@@ -0,0 +1,42 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.util;
+
+public class Parsing {
+    public static int CODE_BLOCK_INDENT = 4;
+
+    public static int columnsToNextTabStop(int column) {
+        // Tab stop is 4
+        return 4 - (column % 4);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/entities.txt b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/entities.txt
new file mode 100644
index 00000000000..5b126923ba8
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/entities.txt
@@ -0,0 +1,2126 @@
+Aacute=Á
+aacute=á
+Abreve=Ă
+abreve=ă
+ac=∾
+acd=∿
+acE=∾̳
+Acirc=Â
+acirc=â
+acute=´
+Acy=А
+acy=а
+AElig=Æ
+aelig=æ
+af=⁡
+Afr=𝔄
+afr=𝔞
+Agrave=À
+agrave=à
+alefsym=ℵ
+aleph=ℵ
+Alpha=Α
+alpha=α
+Amacr=Ā
+amacr=ā
+amalg=⨿
+amp=&
+AMP=&
+andand=⩕
+And=⩓
+and=∧
+andd=⩜
+andslope=⩘
+andv=⩚
+ang=∠
+ange=⦤
+angle=∠
+angmsdaa=⦨
+angmsdab=⦩
+angmsdac=⦪
+angmsdad=⦫
+angmsdae=⦬
+angmsdaf=⦭
+angmsdag=⦮
+angmsdah=⦯
+angmsd=∡
+angrt=∟
+angrtvb=⊾
+angrtvbd=⦝
+angsph=∢
+angst=Å
+angzarr=⍼
+Aogon=Ą
+aogon=ą
+Aopf=𝔸
+aopf=𝕒
+apacir=⩯
+ap=≈
+apE=⩰
+ape=≊
+apid=≋
+apos='
+ApplyFunction=⁡
+approx=≈
+approxeq=≊
+Aring=Å
+aring=å
+Ascr=𝒜
+ascr=𝒶
+Assign=≔
+ast=*
+asymp=≈
+asympeq=≍
+Atilde=Ã
+atilde=ã
+Auml=Ä
+auml=ä
+awconint=∳
+awint=⨑
+backcong=≌
+backepsilon=϶
+backprime=‵
+backsim=∽
+backsimeq=⋍
+Backslash=∖
+Barv=⫧
+barvee=⊽
+barwed=⌅
+Barwed=⌆
+barwedge=⌅
+bbrk=⎵
+bbrktbrk=⎶
+bcong=≌
+Bcy=Б
+bcy=б
+bdquo=„
+becaus=∵
+because=∵
+Because=∵
+bemptyv=⦰
+bepsi=϶
+bernou=ℬ
+Bernoullis=ℬ
+Beta=Β
+beta=β
+beth=ℶ
+between=≬
+Bfr=𝔅
+bfr=𝔟
+bigcap=⋂
+bigcirc=◯
+bigcup=⋃
+bigodot=⨀
+bigoplus=⨁
+bigotimes=⨂
+bigsqcup=⨆
+bigstar=★
+bigtriangledown=▽
+bigtriangleup=△
+biguplus=⨄
+bigvee=⋁
+bigwedge=⋀
+bkarow=⤍
+blacklozenge=⧫
+blacksquare=▪
+blacktriangle=▴
+blacktriangledown=▾
+blacktriangleleft=◂
+blacktriangleright=▸
+blank=␣
+blk12=▒
+blk14=░
+blk34=▓
+block=█
+bne==⃥
+bnequiv=≡⃥
+bNot=⫭
+bnot=⌐
+Bopf=𝔹
+bopf=𝕓
+bot=⊥
+bottom=⊥
+bowtie=⋈
+boxbox=⧉
+boxdl=┐
+boxdL=╕
+boxDl=╖
+boxDL=╗
+boxdr=┌
+boxdR=╒
+boxDr=╓
+boxDR=╔
+boxh=─
+boxH=═
+boxhd=┬
+boxHd=╤
+boxhD=╥
+boxHD=╦
+boxhu=┴
+boxHu=╧
+boxhU=╨
+boxHU=╩
+boxminus=⊟
+boxplus=⊞
+boxtimes=⊠
+boxul=┘
+boxuL=╛
+boxUl=╜
+boxUL=╝
+boxur=└
+boxuR=╘
+boxUr=╙
+boxUR=╚
+boxv=│
+boxV=║
+boxvh=┼
+boxvH=╪
+boxVh=╫
+boxVH=╬
+boxvl=┤
+boxvL=╡
+boxVl=╢
+boxVL=╣
+boxvr=├
+boxvR=╞
+boxVr=╟
+boxVR=╠
+bprime=‵
+breve=˘
+Breve=˘
+brvbar=¦
+bscr=𝒷
+Bscr=ℬ
+bsemi=⁏
+bsim=∽
+bsime=⋍
+bsolb=⧅
+bsol=\
+bsolhsub=⟈
+bull=•
+bullet=•
+bump=≎
+bumpE=⪮
+bumpe=≏
+Bumpeq=≎
+bumpeq=≏
+Cacute=Ć
+cacute=ć
+capand=⩄
+capbrcup=⩉
+capcap=⩋
+cap=∩
+Cap=⋒
+capcup=⩇
+capdot=⩀
+CapitalDifferentialD=ⅅ
+caps=∩︀
+caret=⁁
+caron=ˇ
+Cayleys=ℭ
+ccaps=⩍
+Ccaron=Č
+ccaron=č
+Ccedil=Ç
+ccedil=ç
+Ccirc=Ĉ
+ccirc=ĉ
+Cconint=∰
+ccups=⩌
+ccupssm=⩐
+Cdot=Ċ
+cdot=ċ
+cedil=¸
+Cedilla=¸
+cemptyv=⦲
+cent=¢
+centerdot=·
+CenterDot=·
+cfr=𝔠
+Cfr=ℭ
+CHcy=Ч
+chcy=ч
+check=✓
+checkmark=✓
+Chi=Χ
+chi=χ
+circ=ˆ
+circeq=≗
+circlearrowleft=↺
+circlearrowright=↻
+circledast=⊛
+circledcirc=⊚
+circleddash=⊝
+CircleDot=⊙
+circledR=®
+circledS=Ⓢ
+CircleMinus=⊖
+CirclePlus=⊕
+CircleTimes=⊗
+cir=○
+cirE=⧃
+cire=≗
+cirfnint=⨐
+cirmid=⫯
+cirscir=⧂
+ClockwiseContourIntegral=∲
+CloseCurlyDoubleQuote=”
+CloseCurlyQuote=’
+clubs=♣
+clubsuit=♣
+colon=:
+Colon=∷
+Colone=⩴
+colone=≔
+coloneq=≔
+comma=,
+commat=@
+comp=∁
+compfn=∘
+complement=∁
+complexes=ℂ
+cong=≅
+congdot=⩭
+Congruent=≡
+conint=∮
+Conint=∯
+ContourIntegral=∮
+copf=𝕔
+Copf=ℂ
+coprod=∐
+Coproduct=∐
+copy=©
+COPY=©
+copysr=℗
+CounterClockwiseContourIntegral=∳
+crarr=↵
+cross=✗
+Cross=⨯
+Cscr=𝒞
+cscr=𝒸
+csub=⫏
+csube=⫑
+csup=⫐
+csupe=⫒
+ctdot=⋯
+cudarrl=⤸
+cudarrr=⤵
+cuepr=⋞
+cuesc=⋟
+cularr=↶
+cularrp=⤽
+cupbrcap=⩈
+cupcap=⩆
+CupCap=≍
+cup=∪
+Cup=⋓
+cupcup=⩊
+cupdot=⊍
+cupor=⩅
+cups=∪︀
+curarr=↷
+curarrm=⤼
+curlyeqprec=⋞
+curlyeqsucc=⋟
+curlyvee=⋎
+curlywedge=⋏
+curren=¤
+curvearrowleft=↶
+curvearrowright=↷
+cuvee=⋎
+cuwed=⋏
+cwconint=∲
+cwint=∱
+cylcty=⌭
+dagger=†
+Dagger=‡
+daleth=ℸ
+darr=↓
+Darr=↡
+dArr=⇓
+dash=‐
+Dashv=⫤
+dashv=⊣
+dbkarow=⤏
+dblac=˝
+Dcaron=Ď
+dcaron=ď
+Dcy=Д
+dcy=д
+ddagger=‡
+ddarr=⇊
+DD=ⅅ
+dd=ⅆ
+DDotrahd=⤑
+ddotseq=⩷
+deg=°
+Del=∇
+Delta=Δ
+delta=δ
+demptyv=⦱
+dfisht=⥿
+Dfr=𝔇
+dfr=𝔡
+dHar=⥥
+dharl=⇃
+dharr=⇂
+DiacriticalAcute=´
+DiacriticalDot=˙
+DiacriticalDoubleAcute=˝
+DiacriticalGrave=`
+DiacriticalTilde=˜
+diam=⋄
+diamond=⋄
+Diamond=⋄
+diamondsuit=♦
+diams=♦
+die=¨
+DifferentialD=ⅆ
+digamma=ϝ
+disin=⋲
+div=÷
+divide=÷
+divideontimes=⋇
+divonx=⋇
+DJcy=Ђ
+djcy=ђ
+dlcorn=⌞
+dlcrop=⌍
+dollar=$
+Dopf=𝔻
+dopf=𝕕
+Dot=¨
+dot=˙
+DotDot=⃜
+doteq=≐
+doteqdot=≑
+DotEqual=≐
+dotminus=∸
+dotplus=∔
+dotsquare=⊡
+doublebarwedge=⌆
+DoubleContourIntegral=∯
+DoubleDot=¨
+DoubleDownArrow=⇓
+DoubleLeftArrow=⇐
+DoubleLeftRightArrow=⇔
+DoubleLeftTee=⫤
+DoubleLongLeftArrow=⟸
+DoubleLongLeftRightArrow=⟺
+DoubleLongRightArrow=⟹
+DoubleRightArrow=⇒
+DoubleRightTee=⊨
+DoubleUpArrow=⇑
+DoubleUpDownArrow=⇕
+DoubleVerticalBar=∥
+DownArrowBar=⤓
+downarrow=↓
+DownArrow=↓
+Downarrow=⇓
+DownArrowUpArrow=⇵
+DownBreve=̑
+downdownarrows=⇊
+downharpoonleft=⇃
+downharpoonright=⇂
+DownLeftRightVector=⥐
+DownLeftTeeVector=⥞
+DownLeftVectorBar=⥖
+DownLeftVector=↽
+DownRightTeeVector=⥟
+DownRightVectorBar=⥗
+DownRightVector=⇁
+DownTeeArrow=↧
+DownTee=⊤
+drbkarow=⤐
+drcorn=⌟
+drcrop=⌌
+Dscr=𝒟
+dscr=𝒹
+DScy=Ѕ
+dscy=ѕ
+dsol=⧶
+Dstrok=Đ
+dstrok=đ
+dtdot=⋱
+dtri=▿
+dtrif=▾
+duarr=⇵
+duhar=⥯
+dwangle=⦦
+DZcy=Џ
+dzcy=џ
+dzigrarr=⟿
+Eacute=É
+eacute=é
+easter=⩮
+Ecaron=Ě
+ecaron=ě
+Ecirc=Ê
+ecirc=ê
+ecir=≖
+ecolon=≕
+Ecy=Э
+ecy=э
+eDDot=⩷
+Edot=Ė
+edot=ė
+eDot=≑
+ee=ⅇ
+efDot=≒
+Efr=𝔈
+efr=𝔢
+eg=⪚
+Egrave=È
+egrave=è
+egs=⪖
+egsdot=⪘
+el=⪙
+Element=∈
+elinters=⏧
+ell=ℓ
+els=⪕
+elsdot=⪗
+Emacr=Ē
+emacr=ē
+empty=∅
+emptyset=∅
+EmptySmallSquare=◻
+emptyv=∅
+EmptyVerySmallSquare=▫
+emsp13= 
+emsp14= 
+emsp= 
+ENG=Ŋ
+eng=ŋ
+ensp= 
+Eogon=Ę
+eogon=ę
+Eopf=𝔼
+eopf=𝕖
+epar=⋕
+eparsl=⧣
+eplus=⩱
+epsi=ε
+Epsilon=Ε
+epsilon=ε
+epsiv=ϵ
+eqcirc=≖
+eqcolon=≕
+eqsim=≂
+eqslantgtr=⪖
+eqslantless=⪕
+Equal=⩵
+equals==
+EqualTilde=≂
+equest=≟
+Equilibrium=⇌
+equiv=≡
+equivDD=⩸
+eqvparsl=⧥
+erarr=⥱
+erDot=≓
+escr=ℯ
+Escr=ℰ
+esdot=≐
+Esim=⩳
+esim=≂
+Eta=Η
+eta=η
+ETH=Ð
+eth=ð
+Euml=Ë
+euml=ë
+euro=€
+excl=!
+exist=∃
+Exists=∃
+expectation=ℰ
+exponentiale=ⅇ
+ExponentialE=ⅇ
+fallingdotseq=≒
+Fcy=Ф
+fcy=ф
+female=♀
+ffilig=ffi
+fflig=ff
+ffllig=ffl
+Ffr=𝔉
+ffr=𝔣
+filig=fi
+FilledSmallSquare=◼
+FilledVerySmallSquare=▪
+fjlig=fj
+flat=♭
+fllig=fl
+fltns=▱
+fnof=ƒ
+Fopf=𝔽
+fopf=𝕗
+forall=∀
+ForAll=∀
+fork=⋔
+forkv=⫙
+Fouriertrf=ℱ
+fpartint=⨍
+frac12=½
+frac13=⅓
+frac14=¼
+frac15=⅕
+frac16=⅙
+frac18=⅛
+frac23=⅔
+frac25=⅖
+frac34=¾
+frac35=⅗
+frac38=⅜
+frac45=⅘
+frac56=⅚
+frac58=⅝
+frac78=⅞
+frasl=⁄
+frown=⌢
+fscr=𝒻
+Fscr=ℱ
+gacute=ǵ
+Gamma=Γ
+gamma=γ
+Gammad=Ϝ
+gammad=ϝ
+gap=⪆
+Gbreve=Ğ
+gbreve=ğ
+Gcedil=Ģ
+Gcirc=Ĝ
+gcirc=ĝ
+Gcy=Г
+gcy=г
+Gdot=Ġ
+gdot=ġ
+ge=≥
+gE=≧
+gEl=⪌
+gel=⋛
+geq=≥
+geqq=≧
+geqslant=⩾
+gescc=⪩
+ges=⩾
+gesdot=⪀
+gesdoto=⪂
+gesdotol=⪄
+gesl=⋛︀
+gesles=⪔
+Gfr=𝔊
+gfr=𝔤
+gg=≫
+Gg=⋙
+ggg=⋙
+gimel=ℷ
+GJcy=Ѓ
+gjcy=ѓ
+gla=⪥
+gl=≷
+glE=⪒
+glj=⪤
+gnap=⪊
+gnapprox=⪊
+gne=⪈
+gnE=≩
+gneq=⪈
+gneqq=≩
+gnsim=⋧
+Gopf=𝔾
+gopf=𝕘
+grave=`
+GreaterEqual=≥
+GreaterEqualLess=⋛
+GreaterFullEqual=≧
+GreaterGreater=⪢
+GreaterLess=≷
+GreaterSlantEqual=⩾
+GreaterTilde=≳
+Gscr=𝒢
+gscr=ℊ
+gsim=≳
+gsime=⪎
+gsiml=⪐
+gtcc=⪧
+gtcir=⩺
+gt=>
+GT=>
+Gt=≫
+gtdot=⋗
+gtlPar=⦕
+gtquest=⩼
+gtrapprox=⪆
+gtrarr=⥸
+gtrdot=⋗
+gtreqless=⋛
+gtreqqless=⪌
+gtrless=≷
+gtrsim=≳
+gvertneqq=≩︀
+gvnE=≩︀
+Hacek=ˇ
+hairsp= 
+half=½
+hamilt=ℋ
+HARDcy=Ъ
+hardcy=ъ
+harrcir=⥈
+harr=↔
+hArr=⇔
+harrw=↭
+Hat=^
+hbar=ℏ
+Hcirc=Ĥ
+hcirc=ĥ
+hearts=♥
+heartsuit=♥
+hellip=…
+hercon=⊹
+hfr=𝔥
+Hfr=ℌ
+HilbertSpace=ℋ
+hksearow=⤥
+hkswarow=⤦
+hoarr=⇿
+homtht=∻
+hookleftarrow=↩
+hookrightarrow=↪
+hopf=𝕙
+Hopf=ℍ
+horbar=―
+HorizontalLine=─
+hscr=𝒽
+Hscr=ℋ
+hslash=ℏ
+Hstrok=Ħ
+hstrok=ħ
+HumpDownHump=≎
+HumpEqual=≏
+hybull=⁃
+hyphen=‐
+Iacute=Í
+iacute=í
+ic=⁣
+Icirc=Î
+icirc=î
+Icy=И
+icy=и
+Idot=İ
+IEcy=Е
+iecy=е
+iexcl=¡
+iff=⇔
+ifr=𝔦
+Ifr=ℑ
+Igrave=Ì
+igrave=ì
+ii=ⅈ
+iiiint=⨌
+iiint=∭
+iinfin=⧜
+iiota=℩
+IJlig=IJ
+ijlig=ij
+Imacr=Ī
+imacr=ī
+image=ℑ
+ImaginaryI=ⅈ
+imagline=ℐ
+imagpart=ℑ
+imath=ı
+Im=ℑ
+imof=⊷
+imped=Ƶ
+Implies=⇒
+incare=℅
+in=∈
+infin=∞
+infintie=⧝
+inodot=ı
+intcal=⊺
+int=∫
+Int=∬
+integers=ℤ
+Integral=∫
+intercal=⊺
+Intersection=⋂
+intlarhk=⨗
+intprod=⨼
+InvisibleComma=⁣
+InvisibleTimes=⁢
+IOcy=Ё
+iocy=ё
+Iogon=Į
+iogon=į
+Iopf=𝕀
+iopf=𝕚
+Iota=Ι
+iota=ι
+iprod=⨼
+iquest=¿
+iscr=𝒾
+Iscr=ℐ
+isin=∈
+isindot=⋵
+isinE=⋹
+isins=⋴
+isinsv=⋳
+isinv=∈
+it=⁢
+Itilde=Ĩ
+itilde=ĩ
+Iukcy=І
+iukcy=і
+Iuml=Ï
+iuml=ï
+Jcirc=Ĵ
+jcirc=ĵ
+Jcy=Й
+jcy=й
+Jfr=𝔍
+jfr=𝔧
+jmath=ȷ
+Jopf=𝕁
+jopf=𝕛
+Jscr=𝒥
+jscr=𝒿
+Jsercy=Ј
+jsercy=ј
+Jukcy=Є
+jukcy=є
+Kappa=Κ
+kappa=κ
+kappav=ϰ
+Kcedil=Ķ
+kcedil=ķ
+Kcy=К
+kcy=к
+Kfr=𝔎
+kfr=𝔨
+kgreen=ĸ
+KHcy=Х
+khcy=х
+KJcy=Ќ
+kjcy=ќ
+Kopf=𝕂
+kopf=𝕜
+Kscr=𝒦
+kscr=𝓀
+lAarr=⇚
+Lacute=Ĺ
+lacute=ĺ
+laemptyv=⦴
+lagran=ℒ
+Lambda=Λ
+lambda=λ
+lang=⟨
+Lang=⟪
+langd=⦑
+langle=⟨
+lap=⪅
+Laplacetrf=ℒ
+laquo=«
+larrb=⇤
+larrbfs=⤟
+larr=←
+Larr=↞
+lArr=⇐
+larrfs=⤝
+larrhk=↩
+larrlp=↫
+larrpl=⤹
+larrsim=⥳
+larrtl=↢
+latail=⤙
+lAtail=⤛
+lat=⪫
+late=⪭
+lates=⪭︀
+lbarr=⤌
+lBarr=⤎
+lbbrk=❲
+lbrace={
+lbrack=[
+lbrke=⦋
+lbrksld=⦏
+lbrkslu=⦍
+Lcaron=Ľ
+lcaron=ľ
+Lcedil=Ļ
+lcedil=ļ
+lceil=⌈
+lcub={
+Lcy=Л
+lcy=л
+ldca=⤶
+ldquo=“
+ldquor=„
+ldrdhar=⥧
+ldrushar=⥋
+ldsh=↲
+le=≤
+lE=≦
+LeftAngleBracket=⟨
+LeftArrowBar=⇤
+leftarrow=←
+LeftArrow=←
+Leftarrow=⇐
+LeftArrowRightArrow=⇆
+leftarrowtail=↢
+LeftCeiling=⌈
+LeftDoubleBracket=⟦
+LeftDownTeeVector=⥡
+LeftDownVectorBar=⥙
+LeftDownVector=⇃
+LeftFloor=⌊
+leftharpoondown=↽
+leftharpoonup=↼
+leftleftarrows=⇇
+leftrightarrow=↔
+LeftRightArrow=↔
+Leftrightarrow=⇔
+leftrightarrows=⇆
+leftrightharpoons=⇋
+leftrightsquigarrow=↭
+LeftRightVector=⥎
+LeftTeeArrow=↤
+LeftTee=⊣
+LeftTeeVector=⥚
+leftthreetimes=⋋
+LeftTriangleBar=⧏
+LeftTriangle=⊲
+LeftTriangleEqual=⊴
+LeftUpDownVector=⥑
+LeftUpTeeVector=⥠
+LeftUpVectorBar=⥘
+LeftUpVector=↿
+LeftVectorBar=⥒
+LeftVector=↼
+lEg=⪋
+leg=⋚
+leq=≤
+leqq=≦
+leqslant=⩽
+lescc=⪨
+les=⩽
+lesdot=⩿
+lesdoto=⪁
+lesdotor=⪃
+lesg=⋚︀
+lesges=⪓
+lessapprox=⪅
+lessdot=⋖
+lesseqgtr=⋚
+lesseqqgtr=⪋
+LessEqualGreater=⋚
+LessFullEqual=≦
+LessGreater=≶
+lessgtr=≶
+LessLess=⪡
+lesssim=≲
+LessSlantEqual=⩽
+LessTilde=≲
+lfisht=⥼
+lfloor=⌊
+Lfr=𝔏
+lfr=𝔩
+lg=≶
+lgE=⪑
+lHar=⥢
+lhard=↽
+lharu=↼
+lharul=⥪
+lhblk=▄
+LJcy=Љ
+ljcy=љ
+llarr=⇇
+ll=≪
+Ll=⋘
+llcorner=⌞
+Lleftarrow=⇚
+llhard=⥫
+lltri=◺
+Lmidot=Ŀ
+lmidot=ŀ
+lmoustache=⎰
+lmoust=⎰
+lnap=⪉
+lnapprox=⪉
+lne=⪇
+lnE=≨
+lneq=⪇
+lneqq=≨
+lnsim=⋦
+loang=⟬
+loarr=⇽
+lobrk=⟦
+longleftarrow=⟵
+LongLeftArrow=⟵
+Longleftarrow=⟸
+longleftrightarrow=⟷
+LongLeftRightArrow=⟷
+Longleftrightarrow=⟺
+longmapsto=⟼
+longrightarrow=⟶
+LongRightArrow=⟶
+Longrightarrow=⟹
+looparrowleft=↫
+looparrowright=↬
+lopar=⦅
+Lopf=𝕃
+lopf=𝕝
+loplus=⨭
+lotimes=⨴
+lowast=∗
+lowbar=_
+LowerLeftArrow=↙
+LowerRightArrow=↘
+loz=◊
+lozenge=◊
+lozf=⧫
+lpar=(
+lparlt=⦓
+lrarr=⇆
+lrcorner=⌟
+lrhar=⇋
+lrhard=⥭
+lrm=‎
+lrtri=⊿
+lsaquo=‹
+lscr=𝓁
+Lscr=ℒ
+lsh=↰
+Lsh=↰
+lsim=≲
+lsime=⪍
+lsimg=⪏
+lsqb=[
+lsquo=‘
+lsquor=‚
+Lstrok=Ł
+lstrok=ł
+ltcc=⪦
+ltcir=⩹
+lt=<
+LT=<
+Lt=≪
+ltdot=⋖
+lthree=⋋
+ltimes=⋉
+ltlarr=⥶
+ltquest=⩻
+ltri=◃
+ltrie=⊴
+ltrif=◂
+ltrPar=⦖
+lurdshar=⥊
+luruhar=⥦
+lvertneqq=≨︀
+lvnE=≨︀
+macr=¯
+male=♂
+malt=✠
+maltese=✠
+Map=⤅
+map=↦
+mapsto=↦
+mapstodown=↧
+mapstoleft=↤
+mapstoup=↥
+marker=▮
+mcomma=⨩
+Mcy=М
+mcy=м
+mdash=—
+mDDot=∺
+measuredangle=∡
+MediumSpace= 
+Mellintrf=ℳ
+Mfr=𝔐
+mfr=𝔪
+mho=℧
+micro=µ
+midast=*
+midcir=⫰
+mid=∣
+middot=·
+minusb=⊟
+minus=−
+minusd=∸
+minusdu=⨪
+MinusPlus=∓
+mlcp=⫛
+mldr=…
+mnplus=∓
+models=⊧
+Mopf=𝕄
+mopf=𝕞
+mp=∓
+mscr=𝓂
+Mscr=ℳ
+mstpos=∾
+Mu=Μ
+mu=μ
+multimap=⊸
+mumap=⊸
+nabla=∇
+Nacute=Ń
+nacute=ń
+nang=∠⃒
+nap=≉
+napE=⩰̸
+napid=≋̸
+napos=ʼn
+napprox=≉
+natural=♮
+naturals=ℕ
+natur=♮
+nbsp= 
+nbump=≎̸
+nbumpe=≏̸
+ncap=⩃
+Ncaron=Ň
+ncaron=ň
+Ncedil=Ņ
+ncedil=ņ
+ncong=≇
+ncongdot=⩭̸
+ncup=⩂
+Ncy=Н
+ncy=н
+ndash=–
+nearhk=⤤
+nearr=↗
+neArr=⇗
+nearrow=↗
+ne=≠
+nedot=≐̸
+NegativeMediumSpace=​
+NegativeThickSpace=​
+NegativeThinSpace=​
+NegativeVeryThinSpace=​
+nequiv=≢
+nesear=⤨
+nesim=≂̸
+NestedGreaterGreater=≫
+NestedLessLess=≪
+NewLine=
+
+nexist=∄
+nexists=∄
+Nfr=𝔑
+nfr=𝔫
+ngE=≧̸
+nge=≱
+ngeq=≱
+ngeqq=≧̸
+ngeqslant=⩾̸
+nges=⩾̸
+nGg=⋙̸
+ngsim=≵
+nGt=≫⃒
+ngt=≯
+ngtr=≯
+nGtv=≫̸
+nharr=↮
+nhArr=⇎
+nhpar=⫲
+ni=∋
+nis=⋼
+nisd=⋺
+niv=∋
+NJcy=Њ
+njcy=њ
+nlarr=↚
+nlArr=⇍
+nldr=‥
+nlE=≦̸
+nle=≰
+nleftarrow=↚
+nLeftarrow=⇍
+nleftrightarrow=↮
+nLeftrightarrow=⇎
+nleq=≰
+nleqq=≦̸
+nleqslant=⩽̸
+nles=⩽̸
+nless=≮
+nLl=⋘̸
+nlsim=≴
+nLt=≪⃒
+nlt=≮
+nltri=⋪
+nltrie=⋬
+nLtv=≪̸
+nmid=∤
+NoBreak=⁠
+NonBreakingSpace= 
+nopf=𝕟
+Nopf=ℕ
+Not=⫬
+not=¬
+NotCongruent=≢
+NotCupCap=≭
+NotDoubleVerticalBar=∦
+NotElement=∉
+NotEqual=≠
+NotEqualTilde=≂̸
+NotExists=∄
+NotGreater=≯
+NotGreaterEqual=≱
+NotGreaterFullEqual=≧̸
+NotGreaterGreater=≫̸
+NotGreaterLess=≹
+NotGreaterSlantEqual=⩾̸
+NotGreaterTilde=≵
+NotHumpDownHump=≎̸
+NotHumpEqual=≏̸
+notin=∉
+notindot=⋵̸
+notinE=⋹̸
+notinva=∉
+notinvb=⋷
+notinvc=⋶
+NotLeftTriangleBar=⧏̸
+NotLeftTriangle=⋪
+NotLeftTriangleEqual=⋬
+NotLess=≮
+NotLessEqual=≰
+NotLessGreater=≸
+NotLessLess=≪̸
+NotLessSlantEqual=⩽̸
+NotLessTilde=≴
+NotNestedGreaterGreater=⪢̸
+NotNestedLessLess=⪡̸
+notni=∌
+notniva=∌
+notnivb=⋾
+notnivc=⋽
+NotPrecedes=⊀
+NotPrecedesEqual=⪯̸
+NotPrecedesSlantEqual=⋠
+NotReverseElement=∌
+NotRightTriangleBar=⧐̸
+NotRightTriangle=⋫
+NotRightTriangleEqual=⋭
+NotSquareSubset=⊏̸
+NotSquareSubsetEqual=⋢
+NotSquareSuperset=⊐̸
+NotSquareSupersetEqual=⋣
+NotSubset=⊂⃒
+NotSubsetEqual=⊈
+NotSucceeds=⊁
+NotSucceedsEqual=⪰̸
+NotSucceedsSlantEqual=⋡
+NotSucceedsTilde=≿̸
+NotSuperset=⊃⃒
+NotSupersetEqual=⊉
+NotTilde=≁
+NotTildeEqual=≄
+NotTildeFullEqual=≇
+NotTildeTilde=≉
+NotVerticalBar=∤
+nparallel=∦
+npar=∦
+nparsl=⫽⃥
+npart=∂̸
+npolint=⨔
+npr=⊀
+nprcue=⋠
+nprec=⊀
+npreceq=⪯̸
+npre=⪯̸
+nrarrc=⤳̸
+nrarr=↛
+nrArr=⇏
+nrarrw=↝̸
+nrightarrow=↛
+nRightarrow=⇏
+nrtri=⋫
+nrtrie=⋭
+nsc=⊁
+nsccue=⋡
+nsce=⪰̸
+Nscr=𝒩
+nscr=𝓃
+nshortmid=∤
+nshortparallel=∦
+nsim=≁
+nsime=≄
+nsimeq=≄
+nsmid=∤
+nspar=∦
+nsqsube=⋢
+nsqsupe=⋣
+nsub=⊄
+nsubE=⫅̸
+nsube=⊈
+nsubset=⊂⃒
+nsubseteq=⊈
+nsubseteqq=⫅̸
+nsucc=⊁
+nsucceq=⪰̸
+nsup=⊅
+nsupE=⫆̸
+nsupe=⊉
+nsupset=⊃⃒
+nsupseteq=⊉
+nsupseteqq=⫆̸
+ntgl=≹
+Ntilde=Ñ
+ntilde=ñ
+ntlg=≸
+ntriangleleft=⋪
+ntrianglelefteq=⋬
+ntriangleright=⋫
+ntrianglerighteq=⋭
+Nu=Ν
+nu=ν
+num=#
+numero=№
+numsp= 
+nvap=≍⃒
+nvdash=⊬
+nvDash=⊭
+nVdash=⊮
+nVDash=⊯
+nvge=≥⃒
+nvgt=>⃒
+nvHarr=⤄
+nvinfin=⧞
+nvlArr=⤂
+nvle=≤⃒
+nvlt=<⃒
+nvltrie=⊴⃒
+nvrArr=⤃
+nvrtrie=⊵⃒
+nvsim=∼⃒
+nwarhk=⤣
+nwarr=↖
+nwArr=⇖
+nwarrow=↖
+nwnear=⤧
+Oacute=Ó
+oacute=ó
+oast=⊛
+Ocirc=Ô
+ocirc=ô
+ocir=⊚
+Ocy=О
+ocy=о
+odash=⊝
+Odblac=Ő
+odblac=ő
+odiv=⨸
+odot=⊙
+odsold=⦼
+OElig=Œ
+oelig=œ
+ofcir=⦿
+Ofr=𝔒
+ofr=𝔬
+ogon=˛
+Ograve=Ò
+ograve=ò
+ogt=⧁
+ohbar=⦵
+ohm=Ω
+oint=∮
+olarr=↺
+olcir=⦾
+olcross=⦻
+oline=‾
+olt=⧀
+Omacr=Ō
+omacr=ō
+Omega=Ω
+omega=ω
+Omicron=Ο
+omicron=ο
+omid=⦶
+ominus=⊖
+Oopf=𝕆
+oopf=𝕠
+opar=⦷
+OpenCurlyDoubleQuote=“
+OpenCurlyQuote=‘
+operp=⦹
+oplus=⊕
+orarr=↻
+Or=⩔
+or=∨
+ord=⩝
+order=ℴ
+orderof=ℴ
+ordf=ª
+ordm=º
+origof=⊶
+oror=⩖
+orslope=⩗
+orv=⩛
+oS=Ⓢ
+Oscr=𝒪
+oscr=ℴ
+Oslash=Ø
+oslash=ø
+osol=⊘
+Otilde=Õ
+otilde=õ
+otimesas=⨶
+Otimes=⨷
+otimes=⊗
+Ouml=Ö
+ouml=ö
+ovbar=⌽
+OverBar=‾
+OverBrace=⏞
+OverBracket=⎴
+OverParenthesis=⏜
+para=¶
+parallel=∥
+par=∥
+parsim=⫳
+parsl=⫽
+part=∂
+PartialD=∂
+Pcy=П
+pcy=п
+percnt=%
+period=.
+permil=‰
+perp=⊥
+pertenk=‱
+Pfr=𝔓
+pfr=𝔭
+Phi=Φ
+phi=φ
+phiv=ϕ
+phmmat=ℳ
+phone=☎
+Pi=Π
+pi=π
+pitchfork=⋔
+piv=ϖ
+planck=ℏ
+planckh=ℎ
+plankv=ℏ
+plusacir=⨣
+plusb=⊞
+pluscir=⨢
+plus=+
+plusdo=∔
+plusdu=⨥
+pluse=⩲
+PlusMinus=±
+plusmn=±
+plussim=⨦
+plustwo=⨧
+pm=±
+Poincareplane=ℌ
+pointint=⨕
+popf=𝕡
+Popf=ℙ
+pound=£
+prap=⪷
+Pr=⪻
+pr=≺
+prcue=≼
+precapprox=⪷
+prec=≺
+preccurlyeq=≼
+Precedes=≺
+PrecedesEqual=⪯
+PrecedesSlantEqual=≼
+PrecedesTilde=≾
+preceq=⪯
+precnapprox=⪹
+precneqq=⪵
+precnsim=⋨
+pre=⪯
+prE=⪳
+precsim=≾
+prime=′
+Prime=″
+primes=ℙ
+prnap=⪹
+prnE=⪵
+prnsim=⋨
+prod=∏
+Product=∏
+profalar=⌮
+profline=⌒
+profsurf=⌓
+prop=∝
+Proportional=∝
+Proportion=∷
+propto=∝
+prsim=≾
+prurel=⊰
+Pscr=𝒫
+pscr=𝓅
+Psi=Ψ
+psi=ψ
+puncsp= 
+Qfr=𝔔
+qfr=𝔮
+qint=⨌
+qopf=𝕢
+Qopf=ℚ
+qprime=⁗
+Qscr=𝒬
+qscr=𝓆
+quaternions=ℍ
+quatint=⨖
+quest=?
+questeq=≟
+quot="
+QUOT="
+rAarr=⇛
+race=∽̱
+Racute=Ŕ
+racute=ŕ
+radic=√
+raemptyv=⦳
+rang=⟩
+Rang=⟫
+rangd=⦒
+range=⦥
+rangle=⟩
+raquo=»
+rarrap=⥵
+rarrb=⇥
+rarrbfs=⤠
+rarrc=⤳
+rarr=→
+Rarr=↠
+rArr=⇒
+rarrfs=⤞
+rarrhk=↪
+rarrlp=↬
+rarrpl=⥅
+rarrsim=⥴
+Rarrtl=⤖
+rarrtl=↣
+rarrw=↝
+ratail=⤚
+rAtail=⤜
+ratio=∶
+rationals=ℚ
+rbarr=⤍
+rBarr=⤏
+RBarr=⤐
+rbbrk=❳
+rbrace=}
+rbrack=]
+rbrke=⦌
+rbrksld=⦎
+rbrkslu=⦐
+Rcaron=Ř
+rcaron=ř
+Rcedil=Ŗ
+rcedil=ŗ
+rceil=⌉
+rcub=}
+Rcy=Р
+rcy=р
+rdca=⤷
+rdldhar=⥩
+rdquo=”
+rdquor=”
+rdsh=↳
+real=ℜ
+realine=ℛ
+realpart=ℜ
+reals=ℝ
+Re=ℜ
+rect=▭
+reg=®
+REG=®
+ReverseElement=∋
+ReverseEquilibrium=⇋
+ReverseUpEquilibrium=⥯
+rfisht=⥽
+rfloor=⌋
+rfr=𝔯
+Rfr=ℜ
+rHar=⥤
+rhard=⇁
+rharu=⇀
+rharul=⥬
+Rho=Ρ
+rho=ρ
+rhov=ϱ
+RightAngleBracket=⟩
+RightArrowBar=⇥
+rightarrow=→
+RightArrow=→
+Rightarrow=⇒
+RightArrowLeftArrow=⇄
+rightarrowtail=↣
+RightCeiling=⌉
+RightDoubleBracket=⟧
+RightDownTeeVector=⥝
+RightDownVectorBar=⥕
+RightDownVector=⇂
+RightFloor=⌋
+rightharpoondown=⇁
+rightharpoonup=⇀
+rightleftarrows=⇄
+rightleftharpoons=⇌
+rightrightarrows=⇉
+rightsquigarrow=↝
+RightTeeArrow=↦
+RightTee=⊢
+RightTeeVector=⥛
+rightthreetimes=⋌
+RightTriangleBar=⧐
+RightTriangle=⊳
+RightTriangleEqual=⊵
+RightUpDownVector=⥏
+RightUpTeeVector=⥜
+RightUpVectorBar=⥔
+RightUpVector=↾
+RightVectorBar=⥓
+RightVector=⇀
+ring=˚
+risingdotseq=≓
+rlarr=⇄
+rlhar=⇌
+rlm=‏
+rmoustache=⎱
+rmoust=⎱
+rnmid=⫮
+roang=⟭
+roarr=⇾
+robrk=⟧
+ropar=⦆
+ropf=𝕣
+Ropf=ℝ
+roplus=⨮
+rotimes=⨵
+RoundImplies=⥰
+rpar=)
+rpargt=⦔
+rppolint=⨒
+rrarr=⇉
+Rrightarrow=⇛
+rsaquo=›
+rscr=𝓇
+Rscr=ℛ
+rsh=↱
+Rsh=↱
+rsqb=]
+rsquo=’
+rsquor=’
+rthree=⋌
+rtimes=⋊
+rtri=▹
+rtrie=⊵
+rtrif=▸
+rtriltri=⧎
+RuleDelayed=⧴
+ruluhar=⥨
+rx=℞
+Sacute=Ś
+sacute=ś
+sbquo=‚
+scap=⪸
+Scaron=Š
+scaron=š
+Sc=⪼
+sc=≻
+sccue=≽
+sce=⪰
+scE=⪴
+Scedil=Ş
+scedil=ş
+Scirc=Ŝ
+scirc=ŝ
+scnap=⪺
+scnE=⪶
+scnsim=⋩
+scpolint=⨓
+scsim=≿
+Scy=С
+scy=с
+sdotb=⊡
+sdot=⋅
+sdote=⩦
+searhk=⤥
+searr=↘
+seArr=⇘
+searrow=↘
+sect=§
+semi=;
+seswar=⤩
+setminus=∖
+setmn=∖
+sext=✶
+Sfr=𝔖
+sfr=𝔰
+sfrown=⌢
+sharp=♯
+SHCHcy=Щ
+shchcy=щ
+SHcy=Ш
+shcy=ш
+ShortDownArrow=↓
+ShortLeftArrow=←
+shortmid=∣
+shortparallel=∥
+ShortRightArrow=→
+ShortUpArrow=↑
+shy=­
+Sigma=Σ
+sigma=σ
+sigmaf=ς
+sigmav=ς
+sim=∼
+simdot=⩪
+sime=≃
+simeq=≃
+simg=⪞
+simgE=⪠
+siml=⪝
+simlE=⪟
+simne=≆
+simplus=⨤
+simrarr=⥲
+slarr=←
+SmallCircle=∘
+smallsetminus=∖
+smashp=⨳
+smeparsl=⧤
+smid=∣
+smile=⌣
+smt=⪪
+smte=⪬
+smtes=⪬︀
+SOFTcy=Ь
+softcy=ь
+solbar=⌿
+solb=⧄
+sol=/
+Sopf=𝕊
+sopf=𝕤
+spades=♠
+spadesuit=♠
+spar=∥
+sqcap=⊓
+sqcaps=⊓︀
+sqcup=⊔
+sqcups=⊔︀
+Sqrt=√
+sqsub=⊏
+sqsube=⊑
+sqsubset=⊏
+sqsubseteq=⊑
+sqsup=⊐
+sqsupe=⊒
+sqsupset=⊐
+sqsupseteq=⊒
+square=□
+Square=□
+SquareIntersection=⊓
+SquareSubset=⊏
+SquareSubsetEqual=⊑
+SquareSuperset=⊐
+SquareSupersetEqual=⊒
+SquareUnion=⊔
+squarf=▪
+squ=□
+squf=▪
+srarr=→
+Sscr=𝒮
+sscr=𝓈
+ssetmn=∖
+ssmile=⌣
+sstarf=⋆
+Star=⋆
+star=☆
+starf=★
+straightepsilon=ϵ
+straightphi=ϕ
+strns=¯
+sub=⊂
+Sub=⋐
+subdot=⪽
+subE=⫅
+sube=⊆
+subedot=⫃
+submult=⫁
+subnE=⫋
+subne=⊊
+subplus=⪿
+subrarr=⥹
+subset=⊂
+Subset=⋐
+subseteq=⊆
+subseteqq=⫅
+SubsetEqual=⊆
+subsetneq=⊊
+subsetneqq=⫋
+subsim=⫇
+subsub=⫕
+subsup=⫓
+succapprox=⪸
+succ=≻
+succcurlyeq=≽
+Succeeds=≻
+SucceedsEqual=⪰
+SucceedsSlantEqual=≽
+SucceedsTilde=≿
+succeq=⪰
+succnapprox=⪺
+succneqq=⪶
+succnsim=⋩
+succsim=≿
+SuchThat=∋
+sum=∑
+Sum=∑
+sung=♪
+sup1=¹
+sup2=²
+sup3=³
+sup=⊃
+Sup=⋑
+supdot=⪾
+supdsub=⫘
+supE=⫆
+supe=⊇
+supedot=⫄
+Superset=⊃
+SupersetEqual=⊇
+suphsol=⟉
+suphsub=⫗
+suplarr=⥻
+supmult=⫂
+supnE=⫌
+supne=⊋
+supplus=⫀
+supset=⊃
+Supset=⋑
+supseteq=⊇
+supseteqq=⫆
+supsetneq=⊋
+supsetneqq=⫌
+supsim=⫈
+supsub=⫔
+supsup=⫖
+swarhk=⤦
+swarr=↙
+swArr=⇙
+swarrow=↙
+swnwar=⤪
+szlig=ß
+Tab=	
+target=⌖
+Tau=Τ
+tau=τ
+tbrk=⎴
+Tcaron=Ť
+tcaron=ť
+Tcedil=Ţ
+tcedil=ţ
+Tcy=Т
+tcy=т
+tdot=⃛
+telrec=⌕
+Tfr=𝔗
+tfr=𝔱
+there4=∴
+therefore=∴
+Therefore=∴
+Theta=Θ
+theta=θ
+thetasym=ϑ
+thetav=ϑ
+thickapprox=≈
+thicksim=∼
+ThickSpace=  
+ThinSpace= 
+thinsp= 
+thkap=≈
+thksim=∼
+THORN=Þ
+thorn=þ
+tilde=˜
+Tilde=∼
+TildeEqual=≃
+TildeFullEqual=≅
+TildeTilde=≈
+timesbar=⨱
+timesb=⊠
+times=×
+timesd=⨰
+tint=∭
+toea=⤨
+topbot=⌶
+topcir=⫱
+top=⊤
+Topf=𝕋
+topf=𝕥
+topfork=⫚
+tosa=⤩
+tprime=‴
+trade=™
+TRADE=™
+triangle=▵
+triangledown=▿
+triangleleft=◃
+trianglelefteq=⊴
+triangleq=≜
+triangleright=▹
+trianglerighteq=⊵
+tridot=◬
+trie=≜
+triminus=⨺
+TripleDot=⃛
+triplus=⨹
+trisb=⧍
+tritime=⨻
+trpezium=⏢
+Tscr=𝒯
+tscr=𝓉
+TScy=Ц
+tscy=ц
+TSHcy=Ћ
+tshcy=ћ
+Tstrok=Ŧ
+tstrok=ŧ
+twixt=≬
+twoheadleftarrow=↞
+twoheadrightarrow=↠
+Uacute=Ú
+uacute=ú
+uarr=↑
+Uarr=↟
+uArr=⇑
+Uarrocir=⥉
+Ubrcy=Ў
+ubrcy=ў
+Ubreve=Ŭ
+ubreve=ŭ
+Ucirc=Û
+ucirc=û
+Ucy=У
+ucy=у
+udarr=⇅
+Udblac=Ű
+udblac=ű
+udhar=⥮
+ufisht=⥾
+Ufr=𝔘
+ufr=𝔲
+Ugrave=Ù
+ugrave=ù
+uHar=⥣
+uharl=↿
+uharr=↾
+uhblk=▀
+ulcorn=⌜
+ulcorner=⌜
+ulcrop=⌏
+ultri=◸
+Umacr=Ū
+umacr=ū
+uml=¨
+UnderBar=_
+UnderBrace=⏟
+UnderBracket=⎵
+UnderParenthesis=⏝
+Union=⋃
+UnionPlus=⊎
+Uogon=Ų
+uogon=ų
+Uopf=𝕌
+uopf=𝕦
+UpArrowBar=⤒
+uparrow=↑
+UpArrow=↑
+Uparrow=⇑
+UpArrowDownArrow=⇅
+updownarrow=↕
+UpDownArrow=↕
+Updownarrow=⇕
+UpEquilibrium=⥮
+upharpoonleft=↿
+upharpoonright=↾
+uplus=⊎
+UpperLeftArrow=↖
+UpperRightArrow=↗
+upsi=υ
+Upsi=ϒ
+upsih=ϒ
+Upsilon=Υ
+upsilon=υ
+UpTeeArrow=↥
+UpTee=⊥
+upuparrows=⇈
+urcorn=⌝
+urcorner=⌝
+urcrop=⌎
+Uring=Ů
+uring=ů
+urtri=◹
+Uscr=𝒰
+uscr=𝓊
+utdot=⋰
+Utilde=Ũ
+utilde=ũ
+utri=▵
+utrif=▴
+uuarr=⇈
+Uuml=Ü
+uuml=ü
+uwangle=⦧
+vangrt=⦜
+varepsilon=ϵ
+varkappa=ϰ
+varnothing=∅
+varphi=ϕ
+varpi=ϖ
+varpropto=∝
+varr=↕
+vArr=⇕
+varrho=ϱ
+varsigma=ς
+varsubsetneq=⊊︀
+varsubsetneqq=⫋︀
+varsupsetneq=⊋︀
+varsupsetneqq=⫌︀
+vartheta=ϑ
+vartriangleleft=⊲
+vartriangleright=⊳
+vBar=⫨
+Vbar=⫫
+vBarv=⫩
+Vcy=В
+vcy=в
+vdash=⊢
+vDash=⊨
+Vdash=⊩
+VDash=⊫
+Vdashl=⫦
+veebar=⊻
+vee=∨
+Vee=⋁
+veeeq=≚
+vellip=⋮
+verbar=|
+Verbar=‖
+vert=|
+Vert=‖
+VerticalBar=∣
+VerticalLine=|
+VerticalSeparator=❘
+VerticalTilde=≀
+VeryThinSpace= 
+Vfr=𝔙
+vfr=𝔳
+vltri=⊲
+vnsub=⊂⃒
+vnsup=⊃⃒
+Vopf=𝕍
+vopf=𝕧
+vprop=∝
+vrtri=⊳
+Vscr=𝒱
+vscr=𝓋
+vsubnE=⫋︀
+vsubne=⊊︀
+vsupnE=⫌︀
+vsupne=⊋︀
+Vvdash=⊪
+vzigzag=⦚
+Wcirc=Ŵ
+wcirc=ŵ
+wedbar=⩟
+wedge=∧
+Wedge=⋀
+wedgeq=≙
+weierp=℘
+Wfr=𝔚
+wfr=𝔴
+Wopf=𝕎
+wopf=𝕨
+wp=℘
+wr=≀
+wreath=≀
+Wscr=𝒲
+wscr=𝓌
+xcap=⋂
+xcirc=◯
+xcup=⋃
+xdtri=▽
+Xfr=𝔛
+xfr=𝔵
+xharr=⟷
+xhArr=⟺
+Xi=Ξ
+xi=ξ
+xlarr=⟵
+xlArr=⟸
+xmap=⟼
+xnis=⋻
+xodot=⨀
+Xopf=𝕏
+xopf=𝕩
+xoplus=⨁
+xotime=⨂
+xrarr=⟶
+xrArr=⟹
+Xscr=𝒳
+xscr=𝓍
+xsqcup=⨆
+xuplus=⨄
+xutri=△
+xvee=⋁
+xwedge=⋀
+Yacute=Ý
+yacute=ý
+YAcy=Я
+yacy=я
+Ycirc=Ŷ
+ycirc=ŷ
+Ycy=Ы
+ycy=ы
+yen=¥
+Yfr=𝔜
+yfr=𝔶
+YIcy=Ї
+yicy=ї
+Yopf=𝕐
+yopf=𝕪
+Yscr=𝒴
+yscr=𝓎
+YUcy=Ю
+yucy=ю
+yuml=ÿ
+Yuml=Ÿ
+Zacute=Ź
+zacute=ź
+Zcaron=Ž
+zcaron=ž
+Zcy=З
+zcy=з
+Zdot=Ż
+zdot=ż
+zeetrf=ℨ
+ZeroWidthSpace=​
+Zeta=Ζ
+zeta=ζ
+zfr=𝔷
+Zfr=ℨ
+ZHcy=Ж
+zhcy=ж
+zigrarr=⇝
+zopf=𝕫
+Zopf=ℤ
+Zscr=𝒵
+zscr=𝓏
+zwj=‍
+zwnj=‌
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/AbstractVisitor.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/AbstractVisitor.java
new file mode 100644
index 00000000000..982a6b56550
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/AbstractVisitor.java
@@ -0,0 +1,173 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * Abstract visitor that visits all children by default.
+ * <p>
+ * Can be used to only process certain nodes. If you override a method and want visiting to descend into children,
+ * call {@link #visitChildren}.
+ */
+public abstract class AbstractVisitor implements Visitor {
+
+    @Override
+    public void visit(BlockQuote blockQuote) {
+        visitChildren(blockQuote);
+    }
+
+    @Override
+    public void visit(BulletList bulletList) {
+        visitChildren(bulletList);
+    }
+
+    @Override
+    public void visit(Code code) {
+        visitChildren(code);
+    }
+
+    @Override
+    public void visit(Document document) {
+        visitChildren(document);
+    }
+
+    @Override
+    public void visit(Emphasis emphasis) {
+        visitChildren(emphasis);
+    }
+
+    @Override
+    public void visit(FencedCodeBlock fencedCodeBlock) {
+        visitChildren(fencedCodeBlock);
+    }
+
+    @Override
+    public void visit(HardLineBreak hardLineBreak) {
+        visitChildren(hardLineBreak);
+    }
+
+    @Override
+    public void visit(Heading heading) {
+        visitChildren(heading);
+    }
+
+    @Override
+    public void visit(ThematicBreak thematicBreak) {
+        visitChildren(thematicBreak);
+    }
+
+    @Override
+    public void visit(HtmlInline htmlInline) {
+        visitChildren(htmlInline);
+    }
+
+    @Override
+    public void visit(HtmlBlock htmlBlock) {
+        visitChildren(htmlBlock);
+    }
+
+    @Override
+    public void visit(Image image) {
+        visitChildren(image);
+    }
+
+    @Override
+    public void visit(IndentedCodeBlock indentedCodeBlock) {
+        visitChildren(indentedCodeBlock);
+    }
+
+    @Override
+    public void visit(Link link) {
+        visitChildren(link);
+    }
+
+    @Override
+    public void visit(ListItem listItem) {
+        visitChildren(listItem);
+    }
+
+    @Override
+    public void visit(OrderedList orderedList) {
+        visitChildren(orderedList);
+    }
+
+    @Override
+    public void visit(Paragraph paragraph) {
+        visitChildren(paragraph);
+    }
+
+    @Override
+    public void visit(SoftLineBreak softLineBreak) {
+        visitChildren(softLineBreak);
+    }
+
+    @Override
+    public void visit(StrongEmphasis strongEmphasis) {
+        visitChildren(strongEmphasis);
+    }
+
+    @Override
+    public void visit(Text text) {
+        visitChildren(text);
+    }
+
+    @Override
+    public void visit(LinkReferenceDefinition linkReferenceDefinition) {
+        visitChildren(linkReferenceDefinition);
+    }
+
+    @Override
+    public void visit(CustomBlock customBlock) {
+        visitChildren(customBlock);
+    }
+
+    @Override
+    public void visit(CustomNode customNode) {
+        visitChildren(customNode);
+    }
+
+    /**
+     * Visit the child nodes.
+     *
+     * @param parent the parent node whose children should be visited
+     */
+    protected void visitChildren(Node parent) {
+        Node node = parent.getFirstChild();
+        while (node != null) {
+            // A subclass of this visitor might modify the node, resulting in getNext returning a different node or no
+            // node after visiting it. So get the next node before visiting.
+            Node next = node.getNext();
+            node.accept(this);
+            node = next;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Block.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Block.java
new file mode 100644
index 00000000000..57603fa5fdd
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Block.java
@@ -0,0 +1,51 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * Block nodes such as paragraphs, list blocks, code blocks etc.
+ */
+public abstract class Block extends Node {
+
+    public Block getParent() {
+        return (Block) super.getParent();
+    }
+
+    @Override
+    protected void setParent(Node parent) {
+        if (!(parent instanceof Block)) {
+            throw new IllegalArgumentException("Parent of block must also be block (can not be inline)");
+        }
+        super.setParent(parent);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/BlockQuote.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/BlockQuote.java
new file mode 100644
index 00000000000..8a5f1d20c07
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/BlockQuote.java
@@ -0,0 +1,41 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class BlockQuote extends Block {
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/BulletList.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/BulletList.java
new file mode 100644
index 00000000000..75ab053da3f
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/BulletList.java
@@ -0,0 +1,70 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class BulletList extends ListBlock {
+
+    private String marker;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    /**
+     * @return the bullet list marker that was used, e.g. {@code -}, {@code *} or {@code +}, if available, or null otherwise
+     */
+    public String getMarker() {
+        return marker;
+    }
+
+    public void setMarker(String marker) {
+        this.marker = marker;
+    }
+
+    /**
+     * @deprecated use {@link #getMarker()} instead
+     */
+    @Deprecated
+    public char getBulletMarker() {
+        return marker != null && !marker.isEmpty() ? marker.charAt(0) : '\0';
+    }
+
+    /**
+     * @deprecated use {@link #getMarker()} instead
+     */
+    @Deprecated
+    public void setBulletMarker(char bulletMarker) {
+        this.marker = bulletMarker != '\0' ? String.valueOf(bulletMarker) : null;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Code.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Code.java
new file mode 100644
index 00000000000..b64ddefa1f1
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Code.java
@@ -0,0 +1,58 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class Code extends Node {
+
+    private String literal;
+
+    public Code() {
+    }
+
+    public Code(String literal) {
+        this.literal = literal;
+    }
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    public String getLiteral() {
+        return literal;
+    }
+
+    public void setLiteral(String literal) {
+        this.literal = literal;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/CustomBlock.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/CustomBlock.java
new file mode 100644
index 00000000000..08038848ada
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/CustomBlock.java
@@ -0,0 +1,41 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public abstract class CustomBlock extends Block {
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/CustomNode.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/CustomNode.java
new file mode 100644
index 00000000000..733df320afc
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/CustomNode.java
@@ -0,0 +1,40 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public abstract class CustomNode extends Node {
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Delimited.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Delimited.java
new file mode 100644
index 00000000000..b887aa3f75a
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Delimited.java
@@ -0,0 +1,49 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * A node that uses delimiters in the source form (e.g. <code>*bold*</code>).
+ */
+public interface Delimited {
+
+    /**
+     * @return the opening (beginning) delimiter, e.g. <code>*</code>
+     */
+    String getOpeningDelimiter();
+
+    /**
+     * @return the closing (ending) delimiter, e.g. <code>*</code>
+     */
+    String getClosingDelimiter();
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Document.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Document.java
new file mode 100644
index 00000000000..390728318ec
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Document.java
@@ -0,0 +1,41 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class Document extends Block {
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Emphasis.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Emphasis.java
new file mode 100644
index 00000000000..86b09f4f2f6
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Emphasis.java
@@ -0,0 +1,64 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class Emphasis extends Node implements Delimited {
+
+    private String delimiter;
+
+    public Emphasis() {
+    }
+
+    public Emphasis(String delimiter) {
+        this.delimiter = delimiter;
+    }
+
+    public void setDelimiter(String delimiter) {
+        this.delimiter = delimiter;
+    }
+
+    @Override
+    public String getOpeningDelimiter() {
+        return delimiter;
+    }
+
+    @Override
+    public String getClosingDelimiter() {
+        return delimiter;
+    }
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/FencedCodeBlock.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/FencedCodeBlock.java
new file mode 100644
index 00000000000..d78b3e4292a
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/FencedCodeBlock.java
@@ -0,0 +1,159 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class FencedCodeBlock extends Block {
+
+    private String fenceCharacter;
+    private Integer openingFenceLength;
+    private Integer closingFenceLength;
+    private int fenceIndent;
+
+    private String info;
+    private String literal;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    /**
+     * @return the fence character that was used, e.g. {@code `} or {@code ~}, if available, or null otherwise
+     */
+    public String getFenceCharacter() {
+        return fenceCharacter;
+    }
+
+    public void setFenceCharacter(String fenceCharacter) {
+        this.fenceCharacter = fenceCharacter;
+    }
+
+    /**
+     * @return the length of the opening fence (how many of {{@link #getFenceCharacter()}} were used to start the code
+     * block) if available, or null otherwise
+     */
+    public Integer getOpeningFenceLength() {
+        return openingFenceLength;
+    }
+
+    public void setOpeningFenceLength(Integer openingFenceLength) {
+        if (openingFenceLength != null && openingFenceLength < 3) {
+            throw new IllegalArgumentException("openingFenceLength needs to be >= 3");
+        }
+        checkFenceLengths(openingFenceLength, closingFenceLength);
+        this.openingFenceLength = openingFenceLength;
+    }
+
+    /**
+     * @return the length of the closing fence (how many of {@link #getFenceCharacter()} were used to end the code
+     * block) if available, or null otherwise
+     */
+    public Integer getClosingFenceLength() {
+        return closingFenceLength;
+    }
+
+    public void setClosingFenceLength(Integer closingFenceLength) {
+        if (closingFenceLength != null && closingFenceLength < 3) {
+            throw new IllegalArgumentException("closingFenceLength needs to be >= 3");
+        }
+        checkFenceLengths(openingFenceLength, closingFenceLength);
+        this.closingFenceLength = closingFenceLength;
+    }
+
+    public int getFenceIndent() {
+        return fenceIndent;
+    }
+
+    public void setFenceIndent(int fenceIndent) {
+        this.fenceIndent = fenceIndent;
+    }
+
+    /**
+     * @see <a href="http://spec.commonmark.org/0.18/#info-string">CommonMark spec</a>
+     */
+    public String getInfo() {
+        return info;
+    }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+
+    public String getLiteral() {
+        return literal;
+    }
+
+    public void setLiteral(String literal) {
+        this.literal = literal;
+    }
+
+    /**
+     * @deprecated use {@link #getFenceCharacter()} instead
+     */
+    @Deprecated
+    public char getFenceChar() {
+        return fenceCharacter != null && !fenceCharacter.isEmpty() ? fenceCharacter.charAt(0) : '\0';
+    }
+
+    /**
+     * @deprecated use {@link #setFenceCharacter} instead
+     */
+    @Deprecated
+    public void setFenceChar(char fenceChar) {
+        this.fenceCharacter = fenceChar != '\0' ? String.valueOf(fenceChar) : null;
+    }
+
+    /**
+     * @deprecated use {@link #getOpeningFenceLength} instead
+     */
+    @Deprecated
+    public int getFenceLength() {
+        return openingFenceLength != null ? openingFenceLength : 0;
+    }
+
+    /**
+     * @deprecated use {@link #setOpeningFenceLength} instead
+     */
+    @Deprecated
+    public void setFenceLength(int fenceLength) {
+        this.openingFenceLength = fenceLength != 0 ? fenceLength : null;
+    }
+
+    private static void checkFenceLengths(Integer openingFenceLength, Integer closingFenceLength) {
+        if (openingFenceLength != null && closingFenceLength != null) {
+            if (closingFenceLength < openingFenceLength) {
+                throw new IllegalArgumentException("fence lengths required to be: closingFenceLength >= openingFenceLength");
+            }
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HardLineBreak.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HardLineBreak.java
new file mode 100644
index 00000000000..5c85504a8fb
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HardLineBreak.java
@@ -0,0 +1,41 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class HardLineBreak extends Node {
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Heading.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Heading.java
new file mode 100644
index 00000000000..49a8225fca1
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Heading.java
@@ -0,0 +1,51 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class Heading extends Block {
+
+    private int level;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HtmlBlock.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HtmlBlock.java
new file mode 100644
index 00000000000..94380c084e1
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HtmlBlock.java
@@ -0,0 +1,56 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * HTML block
+ *
+ * @see <a href="http://spec.commonmark.org/0.18/#html-blocks">CommonMark Spec</a>
+ */
+public class HtmlBlock extends Block {
+
+    private String literal;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    public String getLiteral() {
+        return literal;
+    }
+
+    public void setLiteral(String literal) {
+        this.literal = literal;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HtmlInline.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HtmlInline.java
new file mode 100644
index 00000000000..7402606ac83
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HtmlInline.java
@@ -0,0 +1,56 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * Inline HTML element.
+ *
+ * @see <a href="http://spec.commonmark.org/0.24/#raw-html">CommonMark Spec</a>
+ */
+public class HtmlInline extends Node {
+
+    private String literal;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    public String getLiteral() {
+        return literal;
+    }
+
+    public void setLiteral(String literal) {
+        this.literal = literal;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Image.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Image.java
new file mode 100644
index 00000000000..36a3f2f7221
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Image.java
@@ -0,0 +1,73 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class Image extends Node {
+
+    private String destination;
+    private String title;
+
+    public Image() {
+    }
+
+    public Image(String destination, String title) {
+        this.destination = destination;
+        this.title = title;
+    }
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    public String getDestination() {
+        return destination;
+    }
+
+    public void setDestination(String destination) {
+        this.destination = destination;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @Override
+    protected String toStringAttributes() {
+        return "destination=" + destination + ", title=" + title;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/IndentedCodeBlock.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/IndentedCodeBlock.java
new file mode 100644
index 00000000000..d3b4cec41d8
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/IndentedCodeBlock.java
@@ -0,0 +1,51 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class IndentedCodeBlock extends Block {
+
+    private String literal;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    public String getLiteral() {
+        return literal;
+    }
+
+    public void setLiteral(String literal) {
+        this.literal = literal;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Link.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Link.java
new file mode 100644
index 00000000000..448c0b063db
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Link.java
@@ -0,0 +1,93 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * A link with a destination and an optional title; the link text is in child nodes.
+ * <p>
+ * Example for an inline link in a CommonMark document:
+ * <pre><code>
+ * [link](/uri "title")
+ * </code></pre>
+ * <p>
+ * The corresponding Link node would look like this:
+ * <ul>
+ * <li>{@link #getDestination()} returns {@code "/uri"}
+ * <li>{@link #getTitle()} returns {@code "title"}
+ * <li>A {@link Text} child node with {@link Text#getLiteral() getLiteral} that returns {@code "link"}</li>
+ * </ul>
+ * <p>
+ * Note that the text in the link can contain inline formatting, so it could also contain an {@link Image} or
+ * {@link Emphasis}, etc.
+ *
+ * @see <a href="http://spec.commonmark.org/0.26/#links">CommonMark Spec for links</a>
+ */
+public class Link extends Node {
+
+    private String destination;
+    private String title;
+
+    public Link() {
+    }
+
+    public Link(String destination, String title) {
+        this.destination = destination;
+        this.title = title;
+    }
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    public String getDestination() {
+        return destination;
+    }
+
+    public void setDestination(String destination) {
+        this.destination = destination;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @Override
+    protected String toStringAttributes() {
+        return "destination=" + destination + ", title=" + title;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/LinkReferenceDefinition.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/LinkReferenceDefinition.java
new file mode 100644
index 00000000000..9f3e7107e78
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/LinkReferenceDefinition.java
@@ -0,0 +1,89 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * A link reference definition, e.g.:
+ * <pre><code>
+ * [foo]: /url "title"
+ * </code></pre>
+ * <p>
+ * They can be referenced anywhere else in the document to produce a link using <code>[foo]</code>. The definitions
+ * themselves are usually not rendered in the final output.
+ *
+ * @see <a href="https://spec.commonmark.org/0.29/#link-reference-definition">Link reference definitions</a>
+ */
+public class LinkReferenceDefinition extends Node {
+
+    private String label;
+    private String destination;
+    private String title;
+
+    public LinkReferenceDefinition() {
+    }
+
+    public LinkReferenceDefinition(String label, String destination, String title) {
+        this.label = label;
+        this.destination = destination;
+        this.title = title;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getDestination() {
+        return destination;
+    }
+
+    public void setDestination(String destination) {
+        this.destination = destination;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ListBlock.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ListBlock.java
new file mode 100644
index 00000000000..67cccde093a
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ListBlock.java
@@ -0,0 +1,51 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public abstract class ListBlock extends Block {
+
+    private boolean tight;
+
+    /**
+     * @return whether this list is tight or loose
+     * @see <a href="https://spec.commonmark.org/0.28/#tight">CommonMark Spec for tight lists</a>
+     */
+    public boolean isTight() {
+        return tight;
+    }
+
+    public void setTight(boolean tight) {
+        this.tight = tight;
+    }
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ListItem.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ListItem.java
new file mode 100644
index 00000000000..6e1a5d15fb3
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ListItem.java
@@ -0,0 +1,87 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class ListItem extends Block {
+
+    private Integer markerIndent;
+    private Integer contentIndent;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    /**
+     * Returns the indent of the marker such as "-" or "1." in columns (spaces or tab stop of 4) if available, or null
+     * otherwise.
+     * <p>
+     * Some examples and their marker indent:
+     * <pre>- Foo</pre>
+     * Marker indent: 0
+     * <pre> - Foo</pre>
+     * Marker indent: 1
+     * <pre>  1. Foo</pre>
+     * Marker indent: 2
+     */
+    public Integer getMarkerIndent() {
+        return markerIndent;
+    }
+
+    public void setMarkerIndent(Integer markerIndent) {
+        this.markerIndent = markerIndent;
+    }
+
+    /**
+     * Returns the indent of the content in columns (spaces or tab stop of 4) if available, or null otherwise.
+     * The content indent is counted from the beginning of the line and includes the marker on the first line.
+     * <p>
+     * Some examples and their content indent:
+     * <pre>- Foo</pre>
+     * Content indent: 2
+     * <pre> - Foo</pre>
+     * Content indent: 3
+     * <pre>  1. Foo</pre>
+     * Content indent: 5
+     * <p>
+     * Note that subsequent lines in the same list item need to be indented by at least the content indent to be counted
+     * as part of the list item.
+     */
+    public Integer getContentIndent() {
+        return contentIndent;
+    }
+
+    public void setContentIndent(Integer contentIndent) {
+        this.contentIndent = contentIndent;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Node.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Node.java
new file mode 100644
index 00000000000..1607ec2ef5f
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Node.java
@@ -0,0 +1,193 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * The base class of all CommonMark AST nodes ({@link Block} and inlines).
+ * <p>
+ * A node can have multiple children, and a parent (except for the root node).
+ */
+public abstract class Node {
+
+    private Node parent = null;
+    private Node firstChild = null;
+    private Node lastChild = null;
+    private Node prev = null;
+    private Node next = null;
+    private List<SourceSpan> sourceSpans = null;
+
+    public abstract void accept(Visitor visitor);
+
+    public Node getNext() {
+        return next;
+    }
+
+    public Node getPrevious() {
+        return prev;
+    }
+
+    public Node getFirstChild() {
+        return firstChild;
+    }
+
+    public Node getLastChild() {
+        return lastChild;
+    }
+
+    public Node getParent() {
+        return parent;
+    }
+
+    protected void setParent(Node parent) {
+        this.parent = parent;
+    }
+
+    public void appendChild(Node child) {
+        child.unlink();
+        child.setParent(this);
+        if (this.lastChild != null) {
+            this.lastChild.next = child;
+            child.prev = this.lastChild;
+            this.lastChild = child;
+        } else {
+            this.firstChild = child;
+            this.lastChild = child;
+        }
+    }
+
+    public void prependChild(Node child) {
+        child.unlink();
+        child.setParent(this);
+        if (this.firstChild != null) {
+            this.firstChild.prev = child;
+            child.next = this.firstChild;
+            this.firstChild = child;
+        } else {
+            this.firstChild = child;
+            this.lastChild = child;
+        }
+    }
+
+    public void unlink() {
+        if (this.prev != null) {
+            this.prev.next = this.next;
+        } else if (this.parent != null) {
+            this.parent.firstChild = this.next;
+        }
+        if (this.next != null) {
+            this.next.prev = this.prev;
+        } else if (this.parent != null) {
+            this.parent.lastChild = this.prev;
+        }
+        this.parent = null;
+        this.next = null;
+        this.prev = null;
+    }
+
+    public void insertAfter(Node sibling) {
+        sibling.unlink();
+        sibling.next = this.next;
+        if (sibling.next != null) {
+            sibling.next.prev = sibling;
+        }
+        sibling.prev = this;
+        this.next = sibling;
+        sibling.parent = this.parent;
+        if (sibling.next == null) {
+            sibling.parent.lastChild = sibling;
+        }
+    }
+
+    public void insertBefore(Node sibling) {
+        sibling.unlink();
+        sibling.prev = this.prev;
+        if (sibling.prev != null) {
+            sibling.prev.next = sibling;
+        }
+        sibling.next = this;
+        this.prev = sibling;
+        sibling.parent = this.parent;
+        if (sibling.prev == null) {
+            sibling.parent.firstChild = sibling;
+        }
+    }
+
+
+    /**
+     * @return the source spans of this node if included by the parser, an empty list otherwise
+     * @since 0.16.0
+     */
+    public List<SourceSpan> getSourceSpans() {
+        return sourceSpans != null ? Collections.unmodifiableList(sourceSpans) : Collections.<SourceSpan>emptyList();
+    }
+
+    /**
+     * Replace the current source spans with the provided list.
+     *
+     * @param sourceSpans the new source spans to set
+     * @since 0.16.0
+     */
+    public void setSourceSpans(List<SourceSpan> sourceSpans) {
+        if (sourceSpans.isEmpty()) {
+            this.sourceSpans = null;
+        } else {
+            this.sourceSpans = new ArrayList<>(sourceSpans);
+        }
+    }
+
+    /**
+     * Add a source span to the end of the list.
+     *
+     * @param sourceSpan the source span to add
+     * @since 0.16.0
+     */
+    public void addSourceSpan(SourceSpan sourceSpan) {
+        if (sourceSpans == null) {
+            this.sourceSpans = new ArrayList<>();
+        }
+        this.sourceSpans.add(sourceSpan);
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "{" + toStringAttributes() + "}";
+    }
+
+    protected String toStringAttributes() {
+        return "";
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Nodes.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Nodes.java
new file mode 100644
index 00000000000..5be07004284
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Nodes.java
@@ -0,0 +1,98 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+import java.util.Iterator;
+
+/**
+ * Utility class for working with multiple {@link Node}s.
+ *
+ * @since 0.16.0
+ */
+public class Nodes {
+
+    private Nodes() {
+    }
+
+    /**
+     * The nodes between (not including) start and end.
+     */
+    public static Iterable<Node> between(Node start, Node end) {
+        return new NodeIterable(start.getNext(), end);
+    }
+
+    private static class NodeIterable implements Iterable<Node> {
+
+        private final Node first;
+        private final Node end;
+
+        private NodeIterable(Node first, Node end) {
+            this.first = first;
+            this.end = end;
+        }
+
+        @Override
+        public Iterator<Node> iterator() {
+            return new NodeIterator(first, end);
+        }
+    }
+
+    private static class NodeIterator implements Iterator<Node> {
+
+        private Node node;
+        private final Node end;
+
+        private NodeIterator(Node first, Node end) {
+            node = first;
+            this.end = end;
+        }
+
+        @Override
+        public boolean hasNext() {
+            return node != null && node != end;
+        }
+
+        @Override
+        public Node next() {
+            Node result = node;
+            node = node.getNext();
+            return result;
+        }
+
+        @Override
+        public void remove() {
+            throw new UnsupportedOperationException("remove");
+        }
+    }
+}
+
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/OrderedList.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/OrderedList.java
new file mode 100644
index 00000000000..ebee8422f08
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/OrderedList.java
@@ -0,0 +1,98 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class OrderedList extends ListBlock {
+
+    private String markerDelimiter;
+    private Integer markerStartNumber;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    /**
+     * @return the start number used in the marker, e.g. {@code 1}, if available, or null otherwise
+     */
+    public Integer getMarkerStartNumber() {
+        return markerStartNumber;
+    }
+
+    public void setMarkerStartNumber(Integer markerStartNumber) {
+        this.markerStartNumber = markerStartNumber;
+    }
+
+    /**
+     * @return the delimiter used in the marker, e.g. {@code .} or {@code )}, if available, or null otherwise
+     */
+    public String getMarkerDelimiter() {
+        return markerDelimiter;
+    }
+
+    public void setMarkerDelimiter(String markerDelimiter) {
+        this.markerDelimiter = markerDelimiter;
+    }
+
+    /**
+     * @deprecated use {@link #getMarkerStartNumber()} instead
+     */
+    @Deprecated
+    public int getStartNumber() {
+        return markerStartNumber != null ? markerStartNumber : 0;
+    }
+
+    /**
+     * @deprecated use {@link #setMarkerStartNumber} instead
+     */
+    @Deprecated
+    public void setStartNumber(int startNumber) {
+        this.markerStartNumber = startNumber != 0 ? startNumber : null;
+    }
+
+    /**
+     * @deprecated use {@link #getMarkerDelimiter()} instead
+     */
+    @Deprecated
+    public char getDelimiter() {
+        return markerDelimiter != null && !markerDelimiter.isEmpty() ? markerDelimiter.charAt(0) : '\0';
+    }
+
+    /**
+     * @deprecated use {@link #setMarkerDelimiter} instead
+     */
+    @Deprecated
+    public void setDelimiter(char delimiter) {
+        this.markerDelimiter = delimiter != '\0' ? String.valueOf(delimiter) : null;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Paragraph.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Paragraph.java
new file mode 100644
index 00000000000..32168c0251e
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Paragraph.java
@@ -0,0 +1,44 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * A paragraph block, contains inline nodes such as {@link Text}
+ */
+public class Paragraph extends Block {
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SoftLineBreak.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SoftLineBreak.java
new file mode 100644
index 00000000000..1fedc5c899b
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SoftLineBreak.java
@@ -0,0 +1,41 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class SoftLineBreak extends Node {
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SourceSpan.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SourceSpan.java
new file mode 100644
index 00000000000..b816a8bf437
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SourceSpan.java
@@ -0,0 +1,122 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+import java.util.Objects;
+
+/**
+ * A source span references a snippet of text from the source input.
+ * <p>
+ * It has a starting position (line and column index) and a length of how many characters it spans.
+ * <p>
+ * For example, this CommonMark source text:
+ * <pre><code>
+ * &gt; foo
+ * </code></pre>
+ * The {@link BlockQuote} node would have this source span: line 0, column 0, length 5.
+ * <p>
+ * The {@link Paragraph} node inside it would have: line 0, column 2, length 3.
+ * <p>
+ * If a block has multiple lines, it will have a source span for each line.
+ * <p>
+ * Note that the column index and length are measured in Java characters (UTF-16 code units). If you're outputting them
+ * to be consumed by another programming language, e.g. one that uses UTF-8 strings, you will need to translate them,
+ * otherwise characters such as emojis will result in incorrect positions.
+ *
+ * @since 0.16.0
+ */
+public class SourceSpan {
+
+    private final int lineIndex;
+    private final int columnIndex;
+    private final int length;
+
+    public static SourceSpan of(int lineIndex, int columnIndex, int length) {
+        return new SourceSpan(lineIndex, columnIndex, length);
+    }
+
+    private SourceSpan(int lineIndex, int columnIndex, int length) {
+        this.lineIndex = lineIndex;
+        this.columnIndex = columnIndex;
+        this.length = length;
+    }
+
+    /**
+     * @return 0-based index of line in source
+     */
+    public int getLineIndex() {
+        return lineIndex;
+    }
+
+    /**
+     * @return 0-based index of column (character on line) in source
+     */
+    public int getColumnIndex() {
+        return columnIndex;
+    }
+
+    /**
+     * @return length of the span in characters
+     */
+    public int getLength() {
+        return length;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        SourceSpan that = (SourceSpan) o;
+        return lineIndex == that.lineIndex &&
+                columnIndex == that.columnIndex &&
+                length == that.length;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(lineIndex, columnIndex, length);
+    }
+
+    @Override
+    public String toString() {
+        return "SourceSpan{" +
+                "line=" + lineIndex +
+                ", column=" + columnIndex +
+                ", length=" + length +
+                "}";
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SourceSpans.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SourceSpans.java
new file mode 100644
index 00000000000..4a35a89840d
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SourceSpans.java
@@ -0,0 +1,85 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * A list of source spans that can be added to. Takes care of merging adjacent source spans.
+ *
+ * @since 0.16.0
+ */
+public class SourceSpans {
+
+    private List<SourceSpan> sourceSpans;
+
+    public static SourceSpans empty() {
+        return new SourceSpans();
+    }
+
+    public List<SourceSpan> getSourceSpans() {
+        return sourceSpans != null ? sourceSpans : Collections.<SourceSpan>emptyList();
+    }
+
+    public void addAllFrom(Iterable<? extends Node> nodes) {
+        for (Node node : nodes) {
+            addAll(node.getSourceSpans());
+        }
+    }
+
+    public void addAll(List<SourceSpan> other) {
+        if (other.isEmpty()) {
+            return;
+        }
+
+        if (sourceSpans == null) {
+            sourceSpans = new ArrayList<>();
+        }
+
+        if (sourceSpans.isEmpty()) {
+            sourceSpans.addAll(other);
+        } else {
+            int lastIndex = sourceSpans.size() - 1;
+            SourceSpan a = sourceSpans.get(lastIndex);
+            SourceSpan b = other.get(0);
+            if (a.getLineIndex() == b.getLineIndex() && a.getColumnIndex() + a.getLength() == b.getColumnIndex()) {
+                sourceSpans.set(lastIndex, SourceSpan.of(a.getLineIndex(), a.getColumnIndex(), a.getLength() + b.getLength()));
+                sourceSpans.addAll(other.subList(1, other.size()));
+            } else {
+                sourceSpans.addAll(other);
+            }
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/StrongEmphasis.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/StrongEmphasis.java
new file mode 100644
index 00000000000..1efed6d9929
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/StrongEmphasis.java
@@ -0,0 +1,64 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class StrongEmphasis extends Node implements Delimited {
+
+    private String delimiter;
+
+    public StrongEmphasis() {
+    }
+
+    public StrongEmphasis(String delimiter) {
+        this.delimiter = delimiter;
+    }
+
+    public void setDelimiter(String delimiter) {
+        this.delimiter = delimiter;
+    }
+
+    @Override
+    public String getOpeningDelimiter() {
+        return delimiter;
+    }
+
+    @Override
+    public String getClosingDelimiter() {
+        return delimiter;
+    }
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Text.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Text.java
new file mode 100644
index 00000000000..976134d1dd0
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Text.java
@@ -0,0 +1,63 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class Text extends Node {
+
+    private String literal;
+
+    public Text() {
+    }
+
+    public Text(String literal) {
+        this.literal = literal;
+    }
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    public String getLiteral() {
+        return literal;
+    }
+
+    public void setLiteral(String literal) {
+        this.literal = literal;
+    }
+
+    @Override
+    protected String toStringAttributes() {
+        return "literal=" + literal;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ThematicBreak.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ThematicBreak.java
new file mode 100644
index 00000000000..8be13266a33
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ThematicBreak.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class ThematicBreak extends Block {
+
+    private String literal;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    /**
+     * @return the source literal that represents this node, if available
+     */
+    public String getLiteral() {
+        return literal;
+    }
+
+    public void setLiteral(String literal) {
+        this.literal = literal;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Visitor.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Visitor.java
new file mode 100644
index 00000000000..460a6876c28
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Visitor.java
@@ -0,0 +1,87 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * Node visitor.
+ * <p>
+ * Implementations should subclass {@link AbstractVisitor} instead of implementing this directly.
+ */
+public interface Visitor {
+
+    void visit(BlockQuote blockQuote);
+
+    void visit(BulletList bulletList);
+
+    void visit(Code code);
+
+    void visit(Document document);
+
+    void visit(Emphasis emphasis);
+
+    void visit(FencedCodeBlock fencedCodeBlock);
+
+    void visit(HardLineBreak hardLineBreak);
+
+    void visit(Heading heading);
+
+    void visit(ThematicBreak thematicBreak);
+
+    void visit(HtmlInline htmlInline);
+
+    void visit(HtmlBlock htmlBlock);
+
+    void visit(Image image);
+
+    void visit(IndentedCodeBlock indentedCodeBlock);
+
+    void visit(Link link);
+
+    void visit(ListItem listItem);
+
+    void visit(OrderedList orderedList);
+
+    void visit(Paragraph paragraph);
+
+    void visit(SoftLineBreak softLineBreak);
+
+    void visit(StrongEmphasis strongEmphasis);
+
+    void visit(Text text);
+
+    void visit(LinkReferenceDefinition linkReferenceDefinition);
+
+    void visit(CustomBlock customBlock);
+
+    void visit(CustomNode customNode);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/package-info.java
new file mode 100644
index 00000000000..e957ac5b772
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * AST node types (see {@link org.commonmark.node.Node}) and visitors (see {@link org.commonmark.node.AbstractVisitor})
+ */
+package jdk.internal.org.commonmark.node;
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/package-info.java
new file mode 100644
index 00000000000..f3dcba6dc10
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/package-info.java
@@ -0,0 +1,42 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * Root package of commonmark-java
+ * <ul>
+ * <li>{@link org.commonmark.parser} for parsing input text to AST nodes</li>
+ * <li>{@link org.commonmark.node} for AST node types and visitors</li>
+ * <li>{@link org.commonmark.renderer.html} for HTML rendering</li>
+ * <li>{@link org.commonmark.renderer.markdown} for Markdown rendering</li>
+ * </ul>
+ */
+package jdk.internal.org.commonmark;
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/IncludeSourceSpans.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/IncludeSourceSpans.java
new file mode 100644
index 00000000000..27d91f96e76
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/IncludeSourceSpans.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser;
+
+/**
+ * Whether to include {@link org.commonmark.node.SourceSpan} or not while parsing,
+ * see {@link Parser.Builder#includeSourceSpans(IncludeSourceSpans)}.
+ *
+ * @since 0.16.0
+ */
+public enum IncludeSourceSpans {
+    /**
+     * Do not include source spans.
+     */
+    NONE,
+    /**
+     * Include source spans on {@link org.commonmark.node.Block} nodes.
+     */
+    BLOCKS,
+    /**
+     * Include source spans on block nodes and inline nodes.
+     */
+    BLOCKS_AND_INLINES,
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParser.java
new file mode 100644
index 00000000000..e0e4246eb09
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParser.java
@@ -0,0 +1,47 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser;
+
+import jdk.internal.org.commonmark.node.Node;
+
+/**
+ * Parser for inline content (text, links, emphasized text, etc).
+ */
+public interface InlineParser {
+
+    /**
+     * @param lines the source content to parse as inline
+     * @param node the node to append resulting nodes to (as children)
+     */
+    void parse(SourceLines lines, Node node);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParserContext.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParserContext.java
new file mode 100644
index 00000000000..b28faff22be
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParserContext.java
@@ -0,0 +1,59 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser;
+
+import jdk.internal.org.commonmark.node.LinkReferenceDefinition;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterProcessor;
+
+import java.util.List;
+
+/**
+ * Context for inline parsing.
+ */
+public interface InlineParserContext {
+
+    /**
+     * @return custom delimiter processors that have been configured with {@link Parser.Builder#customDelimiterProcessor(DelimiterProcessor)}
+     */
+    List<DelimiterProcessor> getCustomDelimiterProcessors();
+
+    /**
+     * Look up a {@link LinkReferenceDefinition} for a given label.
+     * <p>
+     * Note that the label is not normalized yet; implementations are responsible for normalizing before lookup.
+     *
+     * @param label the link label to look up
+     * @return the definition if one exists, {@code null} otherwise
+     */
+    LinkReferenceDefinition getLinkReferenceDefinition(String label);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParserFactory.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParserFactory.java
new file mode 100644
index 00000000000..6fb0860f48e
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParserFactory.java
@@ -0,0 +1,40 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser;
+
+/**
+ * Factory for custom inline parser.
+ */
+public interface InlineParserFactory {
+    InlineParser create(InlineParserContext inlineParserContext);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/Parser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/Parser.java
new file mode 100644
index 00000000000..40712b97873
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/Parser.java
@@ -0,0 +1,316 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser;
+
+import jdk.internal.org.commonmark.Extension;
+import jdk.internal.org.commonmark.internal.DocumentParser;
+import jdk.internal.org.commonmark.internal.InlineParserContextImpl;
+import jdk.internal.org.commonmark.internal.InlineParserImpl;
+import jdk.internal.org.commonmark.internal.LinkReferenceDefinitions;
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.parser.block.BlockParserFactory;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterProcessor;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+
+/**
+ * Parses input text to a tree of nodes.
+ * <p>
+ * Start with the {@link #builder} method, configure the parser and build it. Example:
+ * <pre><code>
+ * Parser parser = Parser.builder().build();
+ * Node document = parser.parse("input text");
+ * </code></pre>
+ */
+public class Parser {
+
+    private final List<BlockParserFactory> blockParserFactories;
+    private final List<DelimiterProcessor> delimiterProcessors;
+    private final InlineParserFactory inlineParserFactory;
+    private final List<PostProcessor> postProcessors;
+    private final IncludeSourceSpans includeSourceSpans;
+
+    private Parser(Builder builder) {
+        this.blockParserFactories = DocumentParser.calculateBlockParserFactories(builder.blockParserFactories, builder.enabledBlockTypes);
+        this.inlineParserFactory = builder.getInlineParserFactory();
+        this.postProcessors = builder.postProcessors;
+        this.delimiterProcessors = builder.delimiterProcessors;
+        this.includeSourceSpans = builder.includeSourceSpans;
+
+        // Try to construct an inline parser. Invalid configuration might result in an exception, which we want to
+        // detect as soon as possible.
+        this.inlineParserFactory.create(new InlineParserContextImpl(delimiterProcessors, new LinkReferenceDefinitions()));
+    }
+
+    /**
+     * Create a new builder for configuring a {@link Parser}.
+     *
+     * @return a builder
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Parse the specified input text into a tree of nodes.
+     * <p>
+     * This method is thread-safe (a new parser state is used for each invocation).
+     *
+     * @param input the text to parse - must not be null
+     * @return the root node
+     */
+    public Node parse(String input) {
+        if (input == null) {
+            throw new NullPointerException("input must not be null");
+        }
+        DocumentParser documentParser = createDocumentParser();
+        Node document = documentParser.parse(input);
+        return postProcess(document);
+    }
+
+    /**
+     * Parse the specified reader into a tree of nodes. The caller is responsible for closing the reader.
+     * <pre><code>
+     * Parser parser = Parser.builder().build();
+     * try (InputStreamReader reader = new InputStreamReader(new FileInputStream("file.md"), StandardCharsets.UTF_8)) {
+     *     Node document = parser.parseReader(reader);
+     *     // ...
+     * }
+     * </code></pre>
+     * Note that if you have a file with a byte order mark (BOM), you need to skip it before handing the reader to this
+     * library. There's existing classes that do that, e.g. see {@code BOMInputStream} in Commons IO.
+     * <p>
+     * This method is thread-safe (a new parser state is used for each invocation).
+     *
+     * @param input the reader to parse - must not be null
+     * @return the root node
+     * @throws IOException when reading throws an exception
+     */
+    public Node parseReader(Reader input) throws IOException {
+        if (input == null) {
+            throw new NullPointerException("input must not be null");
+        }
+
+        DocumentParser documentParser = createDocumentParser();
+        Node document = documentParser.parse(input);
+        return postProcess(document);
+    }
+
+    private DocumentParser createDocumentParser() {
+        return new DocumentParser(blockParserFactories, inlineParserFactory, delimiterProcessors, includeSourceSpans);
+    }
+
+    private Node postProcess(Node document) {
+        for (PostProcessor postProcessor : postProcessors) {
+            document = postProcessor.process(document);
+        }
+        return document;
+    }
+
+    /**
+     * Builder for configuring a {@link Parser}.
+     */
+    public static class Builder {
+        private final List<BlockParserFactory> blockParserFactories = new ArrayList<>();
+        private final List<DelimiterProcessor> delimiterProcessors = new ArrayList<>();
+        private final List<PostProcessor> postProcessors = new ArrayList<>();
+        private Set<Class<? extends Block>> enabledBlockTypes = DocumentParser.getDefaultBlockParserTypes();
+        private InlineParserFactory inlineParserFactory;
+        private IncludeSourceSpans includeSourceSpans = IncludeSourceSpans.NONE;
+
+        /**
+         * @return the configured {@link Parser}
+         */
+        public Parser build() {
+            return new Parser(this);
+        }
+
+        /**
+         * @param extensions extensions to use on this parser
+         * @return {@code this}
+         */
+        public Builder extensions(Iterable<? extends Extension> extensions) {
+            if (extensions == null) {
+                throw new NullPointerException("extensions must not be null");
+            }
+            for (Extension extension : extensions) {
+                if (extension instanceof ParserExtension) {
+                    ParserExtension parserExtension = (ParserExtension) extension;
+                    parserExtension.extend(this);
+                }
+            }
+            return this;
+        }
+
+        /**
+         * Describe the list of markdown features the parser will recognize and parse.
+         * <p>
+         * By default, CommonMark will recognize and parse the following set of "block" elements:
+         * <ul>
+         * <li>{@link Heading} ({@code #})
+         * <li>{@link HtmlBlock} ({@code <html></html>})
+         * <li>{@link ThematicBreak} (Horizontal Rule) ({@code ---})
+         * <li>{@link FencedCodeBlock} ({@code ```})
+         * <li>{@link IndentedCodeBlock}
+         * <li>{@link BlockQuote} ({@code >})
+         * <li>{@link ListBlock} (Ordered / Unordered List) ({@code 1. / *})
+         * </ul>
+         * <p>
+         * To parse only a subset of the features listed above, pass a list of each feature's associated {@link Block} class.
+         * <p>
+         * E.g., to only parse headings and lists:
+         * <pre>
+         *     {@code
+         *     Parser.builder().enabledBlockTypes(new HashSet<>(Arrays.asList(Heading.class, ListBlock.class)));
+         *     }
+         * </pre>
+         *
+         * @param enabledBlockTypes A list of block nodes the parser will parse.
+         * If this list is empty, the parser will not recognize any CommonMark core features.
+         * @return {@code this}
+         */
+        public Builder enabledBlockTypes(Set<Class<? extends Block>> enabledBlockTypes) {
+            if (enabledBlockTypes == null) {
+                throw new NullPointerException("enabledBlockTypes must not be null");
+            }
+            DocumentParser.checkEnabledBlockTypes(enabledBlockTypes);
+            this.enabledBlockTypes = enabledBlockTypes;
+            return this;
+        }
+
+        /**
+         * Whether to calculate {@link org.commonmark.node.SourceSpan} for {@link Node}.
+         * <p>
+         * By default, source spans are disabled.
+         *
+         * @param includeSourceSpans which kind of source spans should be included
+         * @return {@code this}
+         * @since 0.16.0
+         */
+        public Builder includeSourceSpans(IncludeSourceSpans includeSourceSpans) {
+            this.includeSourceSpans = includeSourceSpans;
+            return this;
+        }
+
+        /**
+         * Adds a custom block parser factory.
+         * <p>
+         * Note that custom factories are applied <em>before</em> the built-in factories. This is so that
+         * extensions can change how some syntax is parsed that would otherwise be handled by built-in factories.
+         * "With great power comes great responsibility."
+         *
+         * @param blockParserFactory a block parser factory implementation
+         * @return {@code this}
+         */
+        public Builder customBlockParserFactory(BlockParserFactory blockParserFactory) {
+            if (blockParserFactory == null) {
+                throw new NullPointerException("blockParserFactory must not be null");
+            }
+            blockParserFactories.add(blockParserFactory);
+            return this;
+        }
+
+        /**
+         * Adds a custom delimiter processor.
+         * <p>
+         * Note that multiple delimiter processors with the same characters can be added, as long as they have a
+         * different minimum length. In that case, the processor with the shortest matching length is used. Adding more
+         * than one delimiter processor with the same character and minimum length is invalid.
+         *
+         * @param delimiterProcessor a delimiter processor implementation
+         * @return {@code this}
+         */
+        public Builder customDelimiterProcessor(DelimiterProcessor delimiterProcessor) {
+            if (delimiterProcessor == null) {
+                throw new NullPointerException("delimiterProcessor must not be null");
+            }
+            delimiterProcessors.add(delimiterProcessor);
+            return this;
+        }
+
+        public Builder postProcessor(PostProcessor postProcessor) {
+            if (postProcessor == null) {
+                throw new NullPointerException("postProcessor must not be null");
+            }
+            postProcessors.add(postProcessor);
+            return this;
+        }
+
+        /**
+         * Overrides the parser used for inline markdown processing.
+         * <p>
+         * Provide an implementation of InlineParserFactory which provides a custom inline parser
+         * to modify how the following are parsed:
+         * bold (**)
+         * italic (*)
+         * strikethrough (~~)
+         * backtick quote (`)
+         * link ([title](http://))
+         * image (![alt](http://))
+         * <p>
+         * Note that if this method is not called or the inline parser factory is set to null, then the default
+         * implementation will be used.
+         *
+         * @param inlineParserFactory an inline parser factory implementation
+         * @return {@code this}
+         */
+        public Builder inlineParserFactory(InlineParserFactory inlineParserFactory) {
+            this.inlineParserFactory = inlineParserFactory;
+            return this;
+        }
+
+        private InlineParserFactory getInlineParserFactory() {
+            if (inlineParserFactory != null) {
+                return inlineParserFactory;
+            }
+            return new InlineParserFactory() {
+                @Override
+                public InlineParser create(InlineParserContext inlineParserContext) {
+                    return new InlineParserImpl(inlineParserContext);
+                }
+            };
+        }
+    }
+
+    /**
+     * Extension for {@link Parser}.
+     */
+    public interface ParserExtension extends Extension {
+        void extend(Builder parserBuilder);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/PostProcessor.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/PostProcessor.java
new file mode 100644
index 00000000000..5cf4f480ae0
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/PostProcessor.java
@@ -0,0 +1,45 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser;
+
+import jdk.internal.org.commonmark.node.Node;
+
+public interface PostProcessor {
+
+    /**
+     * @param node the node to post-process
+     * @return the result of post-processing, may be a modified {@code node} argument
+     */
+    Node process(Node node);
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/SourceLine.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/SourceLine.java
new file mode 100644
index 00000000000..4008e6bece0
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/SourceLine.java
@@ -0,0 +1,79 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser;
+
+import jdk.internal.org.commonmark.node.SourceSpan;
+
+/**
+ * A line or part of a line from the input source.
+ *
+ * @since 0.16.0
+ */
+public class SourceLine {
+
+    private final CharSequence content;
+    private final SourceSpan sourceSpan;
+
+    public static SourceLine of(CharSequence content, SourceSpan sourceSpan) {
+        return new SourceLine(content, sourceSpan);
+    }
+
+    private SourceLine(CharSequence content, SourceSpan sourceSpan) {
+        if (content == null) {
+            throw new NullPointerException("content must not be null");
+        }
+        this.content = content;
+        this.sourceSpan = sourceSpan;
+    }
+
+    public CharSequence getContent() {
+        return content;
+    }
+
+    public SourceSpan getSourceSpan() {
+        return sourceSpan;
+    }
+
+    public SourceLine substring(int beginIndex, int endIndex) {
+        CharSequence newContent = content.subSequence(beginIndex, endIndex);
+        SourceSpan newSourceSpan = null;
+        if (sourceSpan != null) {
+            int columnIndex = sourceSpan.getColumnIndex() + beginIndex;
+            int length = endIndex - beginIndex;
+            if (length != 0) {
+                newSourceSpan = SourceSpan.of(sourceSpan.getLineIndex(), columnIndex, length);
+            }
+        }
+        return SourceLine.of(newContent, newSourceSpan);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/SourceLines.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/SourceLines.java
new file mode 100644
index 00000000000..59bed5c5bf6
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/SourceLines.java
@@ -0,0 +1,98 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser;
+
+import jdk.internal.org.commonmark.node.SourceSpan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A set of lines ({@link SourceLine}) from the input source.
+ *
+ * @since 0.16.0
+ */
+public class SourceLines {
+
+    private final List<SourceLine> lines = new ArrayList<>();
+
+    public static SourceLines empty() {
+        return new SourceLines();
+    }
+
+    public static SourceLines of(SourceLine sourceLine) {
+        SourceLines sourceLines = new SourceLines();
+        sourceLines.addLine(sourceLine);
+        return sourceLines;
+    }
+
+    public static SourceLines of(List<SourceLine> sourceLines) {
+        SourceLines result = new SourceLines();
+        result.lines.addAll(sourceLines);
+        return result;
+    }
+
+    public void addLine(SourceLine sourceLine) {
+        lines.add(sourceLine);
+    }
+
+    public List<SourceLine> getLines() {
+        return lines;
+    }
+
+    public boolean isEmpty() {
+        return lines.isEmpty();
+    }
+
+    public String getContent() {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < lines.size(); i++) {
+            if (i != 0) {
+                sb.append('\n');
+            }
+            sb.append(lines.get(i).getContent());
+        }
+        return sb.toString();
+    }
+
+    public List<SourceSpan> getSourceSpans() {
+        List<SourceSpan> sourceSpans = new ArrayList<>();
+        for (SourceLine line : lines) {
+            SourceSpan sourceSpan = line.getSourceSpan();
+            if (sourceSpan != null) {
+                sourceSpans.add(sourceSpan);
+            }
+        }
+        return sourceSpans;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/Position.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/Position.java
new file mode 100644
index 00000000000..754e409001e
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/Position.java
@@ -0,0 +1,48 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.beta;
+
+/**
+ * Position within a {@link Scanner}. This is intentionally kept opaque so as not to expose the internal structure of
+ * the Scanner.
+ */
+public class Position {
+
+    final int lineIndex;
+    final int index;
+
+    Position(int lineIndex, int index) {
+        this.lineIndex = lineIndex;
+        this.index = index;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/Scanner.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/Scanner.java
new file mode 100644
index 00000000000..e6b1dfaa347
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/Scanner.java
@@ -0,0 +1,313 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.beta;
+
+import jdk.internal.org.commonmark.node.SourceSpan;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.SourceLines;
+import jdk.internal.org.commonmark.text.CharMatcher;
+
+import java.util.List;
+
+public class Scanner {
+
+    /**
+     * Character representing the end of input source (or outside of the text in case of the "previous" methods).
+     * <p>
+     * Note that we can use NULL to represent this because CommonMark does not allow those in the input (we replace them
+     * in the beginning of parsing).
+     */
+    public static final char END = '\0';
+
+    // Lines without newlines at the end. The scanner will yield `\n` between lines because they're significant for
+    // parsing and the final output. There is no `\n` after the last line.
+    private final List<SourceLine> lines;
+    // Which line we're at.
+    private int lineIndex;
+    // The index within the line. If index == length(), we pretend that there's a `\n` and only advance after we yield
+    // that.
+    private int index;
+
+    // Current line or "" if at the end of the lines (using "" instead of null saves a null check)
+    private SourceLine line = SourceLine.of("", null);
+    private int lineLength = 0;
+
+    Scanner(List<SourceLine> lines, int lineIndex, int index) {
+        this.lines = lines;
+        this.lineIndex = lineIndex;
+        this.index = index;
+        if (!lines.isEmpty()) {
+            checkPosition(lineIndex, index);
+            setLine(lines.get(lineIndex));
+        }
+    }
+
+    public static Scanner of(SourceLines lines) {
+        return new Scanner(lines.getLines(), 0, 0);
+    }
+
+    public char peek() {
+        if (index < lineLength) {
+            return line.getContent().charAt(index);
+        } else {
+            if (lineIndex < lines.size() - 1) {
+                return '\n';
+            } else {
+                // Don't return newline for end of last line
+                return END;
+            }
+        }
+    }
+
+    public int peekCodePoint() {
+        if (index < lineLength) {
+            char c = line.getContent().charAt(index);
+            if (Character.isHighSurrogate(c) && index + 1 < lineLength) {
+                char low = line.getContent().charAt(index + 1);
+                if (Character.isLowSurrogate(low)) {
+                    return Character.toCodePoint(c, low);
+                }
+            }
+            return c;
+        } else {
+            if (lineIndex < lines.size() - 1) {
+                return '\n';
+            } else {
+                // Don't return newline for end of last line
+                return END;
+            }
+        }
+    }
+
+    public int peekPreviousCodePoint() {
+        if (index > 0) {
+            int prev = index - 1;
+            char c = line.getContent().charAt(prev);
+            if (Character.isLowSurrogate(c) && prev > 0) {
+                char high = line.getContent().charAt(prev - 1);
+                if (Character.isHighSurrogate(high)) {
+                    return Character.toCodePoint(high, c);
+                }
+            }
+            return c;
+        } else {
+            if (lineIndex > 0) {
+                return '\n';
+            } else {
+                return END;
+            }
+        }
+    }
+
+    public boolean hasNext() {
+        if (index < lineLength) {
+            return true;
+        } else {
+            // No newline at end of last line
+            return lineIndex < lines.size() - 1;
+        }
+    }
+
+    public void next() {
+        index++;
+        if (index > lineLength) {
+            lineIndex++;
+            if (lineIndex < lines.size()) {
+                setLine(lines.get(lineIndex));
+            } else {
+                setLine(SourceLine.of("", null));
+            }
+            index = 0;
+        }
+    }
+
+    /**
+     * Check if the specified char is next and advance the position.
+     *
+     * @param c the char to check (including newline characters)
+     * @return true if matched and position was advanced, false otherwise
+     */
+    public boolean next(char c) {
+        if (peek() == c) {
+            next();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Check if we have the specified content on the line and advanced the position. Note that if you want to match
+     * newline characters, use {@link #next(char)}.
+     *
+     * @param content the text content to match on a single line (excluding newline characters)
+     * @return true if matched and position was advanced, false otherwise
+     */
+    public boolean next(String content) {
+        if (index < lineLength && index + content.length() <= lineLength) {
+            // Can't use startsWith because it's not available on CharSequence
+            for (int i = 0; i < content.length(); i++) {
+                if (line.getContent().charAt(index + i) != content.charAt(i)) {
+                    return false;
+                }
+            }
+            index += content.length();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public int matchMultiple(char c) {
+        int count = 0;
+        while (peek() == c) {
+            count++;
+            next();
+        }
+        return count;
+    }
+
+    public int match(CharMatcher matcher) {
+        int count = 0;
+        while (matcher.matches(peek())) {
+            count++;
+            next();
+        }
+        return count;
+    }
+
+    public int whitespace() {
+        int count = 0;
+        while (true) {
+            switch (peek()) {
+                case ' ':
+                case '\t':
+                case '\n':
+                case '\u000B':
+                case '\f':
+                case '\r':
+                    count++;
+                    next();
+                    break;
+                default:
+                    return count;
+            }
+        }
+    }
+
+    public int find(char c) {
+        int count = 0;
+        while (true) {
+            char cur = peek();
+            if (cur == Scanner.END) {
+                return -1;
+            } else if (cur == c) {
+                return count;
+            }
+            count++;
+            next();
+        }
+    }
+
+    public int find(CharMatcher matcher) {
+        int count = 0;
+        while (true) {
+            char c = peek();
+            if (c == END) {
+                return -1;
+            } else if (matcher.matches(c)) {
+                return count;
+            }
+            count++;
+            next();
+        }
+    }
+
+    // Don't expose the int index, because it would be good if we could switch input to a List<String> of lines later
+    // instead of one contiguous String.
+    public Position position() {
+        return new Position(lineIndex, index);
+    }
+
+    public void setPosition(Position position) {
+        checkPosition(position.lineIndex, position.index);
+        this.lineIndex = position.lineIndex;
+        this.index = position.index;
+        setLine(lines.get(this.lineIndex));
+    }
+
+    // For cases where the caller appends the result to a StringBuilder, we could offer another method to avoid some
+    // unnecessary copying.
+    public SourceLines getSource(Position begin, Position end) {
+        if (begin.lineIndex == end.lineIndex) {
+            // Shortcut for common case of text from a single line
+            SourceLine line = lines.get(begin.lineIndex);
+            CharSequence newContent = line.getContent().subSequence(begin.index, end.index);
+            SourceSpan newSourceSpan = null;
+            SourceSpan sourceSpan = line.getSourceSpan();
+            if (sourceSpan != null) {
+                newSourceSpan = SourceSpan.of(sourceSpan.getLineIndex(), sourceSpan.getColumnIndex() + begin.index, newContent.length());
+            }
+            return SourceLines.of(SourceLine.of(newContent, newSourceSpan));
+        } else {
+            SourceLines sourceLines = SourceLines.empty();
+
+            SourceLine firstLine = lines.get(begin.lineIndex);
+            sourceLines.addLine(firstLine.substring(begin.index, firstLine.getContent().length()));
+
+            // Lines between begin and end (we are appending the full line)
+            for (int line = begin.lineIndex + 1; line < end.lineIndex; line++) {
+                sourceLines.addLine(lines.get(line));
+            }
+
+            SourceLine lastLine = lines.get(end.lineIndex);
+            sourceLines.addLine(lastLine.substring(0, end.index));
+            return sourceLines;
+        }
+    }
+
+    private void setLine(SourceLine line) {
+        this.line = line;
+        this.lineLength = line.getContent().length();
+    }
+
+    private void checkPosition(int lineIndex, int index) {
+        if (lineIndex < 0 || lineIndex >= lines.size()) {
+            throw new IllegalArgumentException("Line index " + lineIndex + " out of range, number of lines: " + lines.size());
+        }
+        SourceLine line = lines.get(lineIndex);
+        if (index < 0 || index > line.getContent().length()) {
+            throw new IllegalArgumentException("Index " + index + " out of range, line length: " + line.getContent().length());
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/package-info.java
new file mode 100644
index 00000000000..549b5073e19
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * Experimental APIs to use for extensions. APIs are subject to change if necessary.
+ */
+package jdk.internal.org.commonmark.parser.beta;
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/AbstractBlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/AbstractBlockParser.java
new file mode 100644
index 00000000000..26cd6220daf
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/AbstractBlockParser.java
@@ -0,0 +1,74 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.block;
+
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.SourceSpan;
+import jdk.internal.org.commonmark.parser.InlineParser;
+import jdk.internal.org.commonmark.parser.SourceLine;
+
+public abstract class AbstractBlockParser implements BlockParser {
+
+    @Override
+    public boolean isContainer() {
+        return false;
+    }
+
+    @Override
+    public boolean canHaveLazyContinuationLines() {
+        return false;
+    }
+
+    @Override
+    public boolean canContain(Block childBlock) {
+        return false;
+    }
+
+    @Override
+    public void addLine(SourceLine line) {
+    }
+
+    @Override
+    public void addSourceSpan(SourceSpan sourceSpan) {
+        getBlock().addSourceSpan(sourceSpan);
+    }
+
+    @Override
+    public void closeBlock() {
+    }
+
+    @Override
+    public void parseInlines(InlineParser inlineParser) {
+    }
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/AbstractBlockParserFactory.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/AbstractBlockParserFactory.java
new file mode 100644
index 00000000000..40c2bf91b66
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/AbstractBlockParserFactory.java
@@ -0,0 +1,36 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.block;
+
+public abstract class AbstractBlockParserFactory implements BlockParserFactory {
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockContinue.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockContinue.java
new file mode 100644
index 00000000000..5fc4e028d22
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockContinue.java
@@ -0,0 +1,61 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.block;
+
+import jdk.internal.org.commonmark.internal.BlockContinueImpl;
+
+/**
+ * Result object for continuing parsing of a block, see static methods for constructors.
+ */
+public class BlockContinue {
+
+    protected BlockContinue() {
+    }
+
+    public static BlockContinue none() {
+        return null;
+    }
+
+    public static BlockContinue atIndex(int newIndex) {
+        return new BlockContinueImpl(newIndex, -1, false);
+    }
+
+    public static BlockContinue atColumn(int newColumn) {
+        return new BlockContinueImpl(-1, newColumn, false);
+    }
+
+    public static BlockContinue finished() {
+        return new BlockContinueImpl(-1, -1, true);
+    }
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockParser.java
new file mode 100644
index 00000000000..e893e70b0ef
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockParser.java
@@ -0,0 +1,88 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.block;
+
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.SourceSpan;
+import jdk.internal.org.commonmark.parser.InlineParser;
+import jdk.internal.org.commonmark.parser.SourceLine;
+
+/**
+ * Parser for a specific block node.
+ * <p>
+ * Implementations should subclass {@link AbstractBlockParser} instead of implementing this directly.
+ */
+public interface BlockParser {
+
+    /**
+     * Return true if the block that is parsed is a container (contains other blocks), or false if it's a leaf.
+     */
+    boolean isContainer();
+
+    /**
+     * Return true if the block can have lazy continuation lines.
+     * <p>
+     * Lazy continuation lines are lines that were rejected by this {@link #tryContinue(ParserState)} but didn't match
+     * any other block parsers either.
+     * <p>
+     * If true is returned here, those lines will get added via {@link #addLine(SourceLine)}. For false, the block is
+     * closed instead.
+     */
+    boolean canHaveLazyContinuationLines();
+
+    boolean canContain(Block childBlock);
+
+    Block getBlock();
+
+    BlockContinue tryContinue(ParserState parserState);
+
+    /**
+     * Add the part of a line that belongs to this block parser to parse (i.e. without any container block markers).
+     * Note that the line will only include a {@link SourceLine#getSourceSpan()} if source spans are enabled for inlines.
+     */
+    void addLine(SourceLine line);
+
+    /**
+     * Add a source span of the currently parsed block. The default implementation in {@link AbstractBlockParser} adds
+     * it to the block. Unless you have some complicated parsing where you need to check source positions, you don't
+     * need to override this.
+     *
+     * @since 0.16.0
+     */
+    void addSourceSpan(SourceSpan sourceSpan);
+
+    void closeBlock();
+
+    void parseInlines(InlineParser inlineParser);
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockParserFactory.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockParserFactory.java
new file mode 100644
index 00000000000..53cc8d35ca7
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockParserFactory.java
@@ -0,0 +1,44 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.block;
+
+/**
+ * Parser factory for a block node for determining when a block starts.
+ * <p>
+ * Implementations should subclass {@link AbstractBlockParserFactory} instead of implementing this directly.
+ */
+public interface BlockParserFactory {
+
+    BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser);
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockStart.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockStart.java
new file mode 100644
index 00000000000..a927abe968b
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockStart.java
@@ -0,0 +1,59 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.block;
+
+import jdk.internal.org.commonmark.internal.BlockStartImpl;
+
+/**
+ * Result object for starting parsing of a block, see static methods for constructors.
+ */
+public abstract class BlockStart {
+
+    protected BlockStart() {
+    }
+
+    public static BlockStart none() {
+        return null;
+    }
+
+    public static BlockStart of(BlockParser... blockParsers) {
+        return new BlockStartImpl(blockParsers);
+    }
+
+    public abstract BlockStart atIndex(int newIndex);
+
+    public abstract BlockStart atColumn(int newColumn);
+
+    public abstract BlockStart replaceActiveBlockParser();
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/MatchedBlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/MatchedBlockParser.java
new file mode 100644
index 00000000000..76a9669d069
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/MatchedBlockParser.java
@@ -0,0 +1,53 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.block;
+
+import jdk.internal.org.commonmark.parser.SourceLines;
+
+/**
+ * Open block parser that was last matched during the continue phase. This is different from the currently active
+ * block parser, as an unmatched block is only closed when a new block is started.
+ * <p><em>This interface is not intended to be implemented by clients.</em></p>
+ */
+public interface MatchedBlockParser {
+
+    BlockParser getMatchedBlockParser();
+
+    /**
+     * Returns the current paragraph lines if the matched block is a paragraph.
+     *
+     * @return paragraph content or an empty list
+     */
+    SourceLines getParagraphLines();
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/ParserState.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/ParserState.java
new file mode 100644
index 00000000000..7bda0620a8a
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/ParserState.java
@@ -0,0 +1,82 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.block;
+
+import jdk.internal.org.commonmark.parser.SourceLine;
+
+/**
+ * State of the parser that is used in block parsers.
+ * <p><em>This interface is not intended to be implemented by clients.</em></p>
+ */
+public interface ParserState {
+
+    /**
+     * @return the current source line being parsed (full line)
+     */
+    SourceLine getLine();
+
+    /**
+     * @return the current index within the line (0-based)
+     */
+    int getIndex();
+
+    /**
+     * @return the index of the next non-space character starting from {@link #getIndex()} (may be the same) (0-based)
+     */
+    int getNextNonSpaceIndex();
+
+    /**
+     * The column is the position within the line after tab characters have been processed as 4-space tab stops.
+     * If the line doesn't contain any tabs, it's the same as the {@link #getIndex()}. If the line starts with a tab,
+     * followed by text, then the column for the first character of the text is 4 (the index is 1).
+     *
+     * @return the current column within the line (0-based)
+     */
+    int getColumn();
+
+    /**
+     * @return the indentation in columns (either by spaces or tab stop of 4), starting from {@link #getColumn()}
+     */
+    int getIndent();
+
+    /**
+     * @return true if the current line is blank starting from the index
+     */
+    boolean isBlank();
+
+    /**
+     * @return the deepest open block parser
+     */
+    BlockParser getActiveBlockParser();
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/package-info.java
new file mode 100644
index 00000000000..7bcb61e8a86
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * Types for extending block parsing
+ */
+package jdk.internal.org.commonmark.parser.block;
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/delimiter/DelimiterProcessor.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/delimiter/DelimiterProcessor.java
new file mode 100644
index 00000000000..592f6a5e433
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/delimiter/DelimiterProcessor.java
@@ -0,0 +1,76 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.delimiter;
+
+import jdk.internal.org.commonmark.node.Text;
+
+/**
+ * Custom delimiter processor for additional delimiters besides {@code _} and {@code *}.
+ * <p>
+ * Note that implementations of this need to be thread-safe, the same instance may be used by multiple parsers.
+ */
+public interface DelimiterProcessor {
+
+    /**
+     * @return the character that marks the beginning of a delimited node, must not clash with any built-in special
+     * characters
+     */
+    char getOpeningCharacter();
+
+    /**
+     * @return the character that marks the the ending of a delimited node, must not clash with any built-in special
+     * characters. Note that for a symmetric delimiter such as "*", this is the same as the opening.
+     */
+    char getClosingCharacter();
+
+    /**
+     * Minimum number of delimiter characters that are needed to activate this. Must be at least 1.
+     */
+    int getMinLength();
+
+    /**
+     * Process the delimiter runs.
+     * <p>
+     * The processor can examine the runs and the nodes and decide if it wants to process or not. If not, it should not
+     * change any nodes and return 0. If yes, it should do the processing (wrapping nodes, etc) and then return how many
+     * delimiters were used.
+     * <p>
+     * Note that removal (unlinking) of the used delimiter {@link Text} nodes is done by the caller.
+     *
+     * @param openingRun the opening delimiter run
+     * @param closingRun the closing delimiter run
+     * @return how many delimiters were used; must not be greater than length of either opener or closer
+     */
+    int process(DelimiterRun openingRun, DelimiterRun closingRun);
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/delimiter/DelimiterRun.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/delimiter/DelimiterRun.java
new file mode 100644
index 00000000000..9672c1906cf
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/delimiter/DelimiterRun.java
@@ -0,0 +1,90 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.delimiter;
+
+import jdk.internal.org.commonmark.node.Text;
+
+/**
+ * A delimiter run is one or more of the same delimiter character, e.g. {@code ***}.
+ */
+public interface DelimiterRun {
+
+    /**
+     * @return whether this can open a delimiter
+     */
+    boolean canOpen();
+
+    /**
+     * @return whether this can close a delimiter
+     */
+    boolean canClose();
+
+    /**
+     * @return the number of characters in this delimiter run (that are left for processing)
+     */
+    int length();
+
+    /**
+     * @return the number of characters originally in this delimiter run; at the start of processing, this is the same
+     * as {{@link #length()}}
+     */
+    int originalLength();
+
+    /**
+     * @return the innermost opening delimiter, e.g. for {@code ***} this is the last {@code *}
+     */
+    Text getOpener();
+
+    /**
+     * @return the innermost closing delimiter, e.g. for {@code ***} this is the first {@code *}
+     */
+    Text getCloser();
+
+    /**
+     * Get the opening delimiter nodes for the specified length of delimiters. Length must be between 1 and
+     * {@link #length()}.
+     * <p>
+     * For example, for a delimiter run {@code ***}, calling this with 1 would return the last {@code *}.
+     * Calling it with 2 would return the second last {@code *} and the last {@code *}.
+     */
+    Iterable<Text> getOpeners(int length);
+
+    /**
+     * Get the closing delimiter nodes for the specified length of delimiters. Length must be between 1 and
+     * {@link #length()}.
+     * <p>
+     * For example, for a delimiter run {@code ***}, calling this with 1 would return the first {@code *}.
+     * Calling it with 2 would return the first {@code *} and the second {@code *}.
+     */
+    Iterable<Text> getClosers(int length);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/package-info.java
new file mode 100644
index 00000000000..b7bc957cc06
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * Parsing input text to AST nodes (see {@link org.commonmark.parser.Parser})
+ */
+package jdk.internal.org.commonmark.parser;
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/NodeRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/NodeRenderer.java
new file mode 100644
index 00000000000..00d6c185920
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/NodeRenderer.java
@@ -0,0 +1,55 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer;
+
+import jdk.internal.org.commonmark.node.Node;
+
+import java.util.Set;
+
+/**
+ * A renderer for a set of node types.
+ */
+public interface NodeRenderer {
+
+    /**
+     * @return the types of nodes that this renderer handles
+     */
+    Set<Class<? extends Node>> getNodeTypes();
+
+    /**
+     * Render the specified node.
+     *
+     * @param node the node to render, will be an instance of one of {@link #getNodeTypes()}
+     */
+    void render(Node node);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/Renderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/Renderer.java
new file mode 100644
index 00000000000..9cee90af7d9
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/Renderer.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer;
+
+import jdk.internal.org.commonmark.node.Node;
+
+public interface Renderer {
+
+    /**
+     * Render the tree of nodes to output.
+     *
+     * @param node the root node
+     * @param output output for rendering
+     */
+    void render(Node node, Appendable output);
+
+    /**
+     * Render the tree of nodes to string.
+     *
+     * @param node the root node
+     * @return the rendered string
+     */
+    String render(Node node);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProvider.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProvider.java
new file mode 100644
index 00000000000..4c9b33adb80
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProvider.java
@@ -0,0 +1,61 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+import jdk.internal.org.commonmark.node.Node;
+
+import java.util.Map;
+
+/**
+ * Extension point for adding/changing attributes on HTML tags for a node.
+ */
+public interface AttributeProvider {
+
+    /**
+     * Set the attributes for a HTML tag of the specified node by modifying the provided map.
+     * <p>
+     * This allows to change or even remove default attributes. With great power comes great responsibility.
+     * <p>
+     * The attribute key and values will be escaped (preserving character entities), so don't escape them here,
+     * otherwise they will be double-escaped.
+     * <p>
+     * This method may be called multiple times for the same node, if the node is rendered using multiple nested
+     * tags (e.g. code blocks).
+     *
+     * @param node the node to set attributes for
+     * @param tagName the HTML tag name that these attributes are for (e.g. {@code h1}, {@code pre}, {@code code}).
+     * @param attributes the attributes, with any default attributes already set in the map
+     */
+    void setAttributes(Node node, String tagName, Map<String, String> attributes);
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProviderContext.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProviderContext.java
new file mode 100644
index 00000000000..92ca0383b74
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProviderContext.java
@@ -0,0 +1,41 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+/**
+ * The context for attribute providers.
+ * <p>Note: There are currently no methods here, this is for future extensibility.</p>
+ * <p><em>This interface is not intended to be implemented by clients.</em></p>
+ */
+public interface AttributeProviderContext {
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProviderFactory.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProviderFactory.java
new file mode 100644
index 00000000000..e4503daffab
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProviderFactory.java
@@ -0,0 +1,47 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+/**
+ * Factory for instantiating new attribute providers when rendering is done.
+ */
+public interface AttributeProviderFactory {
+
+    /**
+     * Create a new attribute provider.
+     *
+     * @param context for this attribute provider
+     * @return an AttributeProvider
+     */
+    AttributeProvider create(AttributeProviderContext context);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/CoreHtmlNodeRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/CoreHtmlNodeRenderer.java
new file mode 100644
index 00000000000..646cc7413ac
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/CoreHtmlNodeRenderer.java
@@ -0,0 +1,352 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+
+import java.util.*;
+
+/**
+ * The node renderer that renders all the core nodes (comes last in the order of node renderers).
+ */
+public class CoreHtmlNodeRenderer extends AbstractVisitor implements NodeRenderer {
+
+    protected final HtmlNodeRendererContext context;
+    private final HtmlWriter html;
+
+    public CoreHtmlNodeRenderer(HtmlNodeRendererContext context) {
+        this.context = context;
+        this.html = context.getWriter();
+    }
+
+    @Override
+    public Set<Class<? extends Node>> getNodeTypes() {
+        return new HashSet<>(Arrays.asList(
+                Document.class,
+                Heading.class,
+                Paragraph.class,
+                BlockQuote.class,
+                BulletList.class,
+                FencedCodeBlock.class,
+                HtmlBlock.class,
+                ThematicBreak.class,
+                IndentedCodeBlock.class,
+                Link.class,
+                ListItem.class,
+                OrderedList.class,
+                Image.class,
+                Emphasis.class,
+                StrongEmphasis.class,
+                Text.class,
+                Code.class,
+                HtmlInline.class,
+                SoftLineBreak.class,
+                HardLineBreak.class
+        ));
+    }
+
+    @Override
+    public void render(Node node) {
+        node.accept(this);
+    }
+
+    @Override
+    public void visit(Document document) {
+        // No rendering itself
+        visitChildren(document);
+    }
+
+    @Override
+    public void visit(Heading heading) {
+        String htag = "h" + heading.getLevel();
+        html.line();
+        html.tag(htag, getAttrs(heading, htag));
+        visitChildren(heading);
+        html.tag('/' + htag);
+        html.line();
+    }
+
+    @Override
+    public void visit(Paragraph paragraph) {
+        boolean inTightList = isInTightList(paragraph);
+        if (!inTightList) {
+            html.line();
+            html.tag("p", getAttrs(paragraph, "p"));
+        }
+        visitChildren(paragraph);
+        if (!inTightList) {
+            html.tag("/p");
+            html.line();
+        }
+    }
+
+    @Override
+    public void visit(BlockQuote blockQuote) {
+        html.line();
+        html.tag("blockquote", getAttrs(blockQuote, "blockquote"));
+        html.line();
+        visitChildren(blockQuote);
+        html.line();
+        html.tag("/blockquote");
+        html.line();
+    }
+
+    @Override
+    public void visit(BulletList bulletList) {
+        renderListBlock(bulletList, "ul", getAttrs(bulletList, "ul"));
+    }
+
+    @Override
+    public void visit(FencedCodeBlock fencedCodeBlock) {
+        String literal = fencedCodeBlock.getLiteral();
+        Map<String, String> attributes = new LinkedHashMap<>();
+        String info = fencedCodeBlock.getInfo();
+        if (info != null && !info.isEmpty()) {
+            int space = info.indexOf(" ");
+            String language;
+            if (space == -1) {
+                language = info;
+            } else {
+                language = info.substring(0, space);
+            }
+            attributes.put("class", "language-" + language);
+        }
+        renderCodeBlock(literal, fencedCodeBlock, attributes);
+    }
+
+    @Override
+    public void visit(HtmlBlock htmlBlock) {
+        html.line();
+        if (context.shouldEscapeHtml()) {
+            html.tag("p", getAttrs(htmlBlock, "p"));
+            html.text(htmlBlock.getLiteral());
+            html.tag("/p");
+        } else {
+            html.raw(htmlBlock.getLiteral());
+        }
+        html.line();
+    }
+
+    @Override
+    public void visit(ThematicBreak thematicBreak) {
+        html.line();
+        html.tag("hr", getAttrs(thematicBreak, "hr"), true);
+        html.line();
+    }
+
+    @Override
+    public void visit(IndentedCodeBlock indentedCodeBlock) {
+        renderCodeBlock(indentedCodeBlock.getLiteral(), indentedCodeBlock, Collections.<String, String>emptyMap());
+    }
+
+    @Override
+    public void visit(Link link) {
+        Map<String, String> attrs = new LinkedHashMap<>();
+        String url = link.getDestination();
+
+        if (context.shouldSanitizeUrls()) {
+            url = context.urlSanitizer().sanitizeLinkUrl(url);
+            attrs.put("rel", "nofollow");
+        }
+
+        url = context.encodeUrl(url);
+        attrs.put("href", url);
+        if (link.getTitle() != null) {
+            attrs.put("title", link.getTitle());
+        }
+        html.tag("a", getAttrs(link, "a", attrs));
+        visitChildren(link);
+        html.tag("/a");
+    }
+
+    @Override
+    public void visit(ListItem listItem) {
+        html.tag("li", getAttrs(listItem, "li"));
+        visitChildren(listItem);
+        html.tag("/li");
+        html.line();
+    }
+
+    @Override
+    public void visit(OrderedList orderedList) {
+        int start = orderedList.getMarkerStartNumber() != null ? orderedList.getMarkerStartNumber() : 1;
+        Map<String, String> attrs = new LinkedHashMap<>();
+        if (start != 1) {
+            attrs.put("start", String.valueOf(start));
+        }
+        renderListBlock(orderedList, "ol", getAttrs(orderedList, "ol", attrs));
+    }
+
+    @Override
+    public void visit(Image image) {
+        String url = image.getDestination();
+
+        AltTextVisitor altTextVisitor = new AltTextVisitor();
+        image.accept(altTextVisitor);
+        String altText = altTextVisitor.getAltText();
+
+        Map<String, String> attrs = new LinkedHashMap<>();
+        if (context.shouldSanitizeUrls()) {
+            url = context.urlSanitizer().sanitizeImageUrl(url);
+        }
+
+        attrs.put("src", context.encodeUrl(url));
+        attrs.put("alt", altText);
+        if (image.getTitle() != null) {
+            attrs.put("title", image.getTitle());
+        }
+
+        html.tag("img", getAttrs(image, "img", attrs), true);
+    }
+
+    @Override
+    public void visit(Emphasis emphasis) {
+        html.tag("em", getAttrs(emphasis, "em"));
+        visitChildren(emphasis);
+        html.tag("/em");
+    }
+
+    @Override
+    public void visit(StrongEmphasis strongEmphasis) {
+        html.tag("strong", getAttrs(strongEmphasis, "strong"));
+        visitChildren(strongEmphasis);
+        html.tag("/strong");
+    }
+
+    @Override
+    public void visit(Text text) {
+        html.text(text.getLiteral());
+    }
+
+    @Override
+    public void visit(Code code) {
+        html.tag("code", getAttrs(code, "code"));
+        html.text(code.getLiteral());
+        html.tag("/code");
+    }
+
+    @Override
+    public void visit(HtmlInline htmlInline) {
+        if (context.shouldEscapeHtml()) {
+            html.text(htmlInline.getLiteral());
+        } else {
+            html.raw(htmlInline.getLiteral());
+        }
+    }
+
+    @Override
+    public void visit(SoftLineBreak softLineBreak) {
+        html.raw(context.getSoftbreak());
+    }
+
+    @Override
+    public void visit(HardLineBreak hardLineBreak) {
+        html.tag("br", getAttrs(hardLineBreak, "br"), true);
+        html.line();
+    }
+
+    @Override
+    protected void visitChildren(Node parent) {
+        Node node = parent.getFirstChild();
+        while (node != null) {
+            Node next = node.getNext();
+            context.render(node);
+            node = next;
+        }
+    }
+
+    private void renderCodeBlock(String literal, Node node, Map<String, String> attributes) {
+        html.line();
+        html.tag("pre", getAttrs(node, "pre"));
+        html.tag("code", getAttrs(node, "code", attributes));
+        html.text(literal);
+        html.tag("/code");
+        html.tag("/pre");
+        html.line();
+    }
+
+    private void renderListBlock(ListBlock listBlock, String tagName, Map<String, String> attributes) {
+        html.line();
+        html.tag(tagName, attributes);
+        html.line();
+        visitChildren(listBlock);
+        html.line();
+        html.tag('/' + tagName);
+        html.line();
+    }
+
+    private boolean isInTightList(Paragraph paragraph) {
+        Node parent = paragraph.getParent();
+        if (parent != null) {
+            Node gramps = parent.getParent();
+            if (gramps instanceof ListBlock) {
+                ListBlock list = (ListBlock) gramps;
+                return list.isTight();
+            }
+        }
+        return false;
+    }
+
+    private Map<String, String> getAttrs(Node node, String tagName) {
+        return getAttrs(node, tagName, Collections.<String, String>emptyMap());
+    }
+
+    private Map<String, String> getAttrs(Node node, String tagName, Map<String, String> defaultAttributes) {
+        return context.extendAttributes(node, tagName, defaultAttributes);
+    }
+
+    private static class AltTextVisitor extends AbstractVisitor {
+
+        private final StringBuilder sb = new StringBuilder();
+
+        String getAltText() {
+            return sb.toString();
+        }
+
+        @Override
+        public void visit(Text text) {
+            sb.append(text.getLiteral());
+        }
+
+        @Override
+        public void visit(SoftLineBreak softLineBreak) {
+            sb.append('\n');
+        }
+
+        @Override
+        public void visit(HardLineBreak hardLineBreak) {
+            sb.append('\n');
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/DefaultUrlSanitizer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/DefaultUrlSanitizer.java
new file mode 100644
index 00000000000..16e094afe16
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/DefaultUrlSanitizer.java
@@ -0,0 +1,115 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ *
+ * Allows http, https and mailto protocols for url.
+ * Also allows protocol relative urls, and relative urls.
+ * Implementation based on https://github.com/OWASP/java-html-sanitizer/blob/f07e44b034a45d94d6fd010279073c38b6933072/src/main/java/org/owasp/html/FilterUrlByProtocolAttributePolicy.java
+ */
+public class DefaultUrlSanitizer implements UrlSanitizer {
+    private Set<String> protocols;
+
+    public DefaultUrlSanitizer() {
+        this(Arrays.asList("http", "https", "mailto"));
+    }
+
+    public DefaultUrlSanitizer(Collection<String> protocols) {
+        this.protocols = new HashSet<>(protocols);
+    }
+
+    @Override
+    public String sanitizeLinkUrl(String url) {
+        url = stripHtmlSpaces(url);
+        protocol_loop:
+        for (int i = 0, n = url.length(); i < n; ++i) {
+            switch (url.charAt(i)) {
+                case '/':
+                case '#':
+                case '?':  // No protocol.
+                    break protocol_loop;
+                case ':':
+                    String protocol = url.substring(0, i).toLowerCase();
+                    if (!protocols.contains(protocol)) {
+                        return "";
+                    }
+                    break protocol_loop;
+            }
+        }
+        return url;
+    }
+
+
+    @Override
+    public String sanitizeImageUrl(String url) {
+        return sanitizeLinkUrl(url);
+    }
+
+    private String stripHtmlSpaces(String s) {
+        int i = 0, n = s.length();
+        for (; n > i; --n) {
+            if (!isHtmlSpace(s.charAt(n - 1))) {
+                break;
+            }
+        }
+        for (; i < n; ++i) {
+            if (!isHtmlSpace(s.charAt(i))) {
+                break;
+            }
+        }
+        if (i == 0 && n == s.length()) {
+            return s;
+        }
+        return s.substring(i, n);
+    }
+
+    private boolean isHtmlSpace(int ch) {
+        switch (ch) {
+            case ' ':
+            case '\t':
+            case '\n':
+            case '\u000c':
+            case '\r':
+                return true;
+            default:
+                return false;
+
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlNodeRendererContext.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlNodeRendererContext.java
new file mode 100644
index 00000000000..78dc295cb21
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlNodeRendererContext.java
@@ -0,0 +1,93 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+import jdk.internal.org.commonmark.node.Image;
+import jdk.internal.org.commonmark.node.Link;
+import jdk.internal.org.commonmark.node.Node;
+
+import java.util.Map;
+
+public interface HtmlNodeRendererContext {
+
+    /**
+     * @param url to be encoded
+     * @return an encoded URL (depending on the configuration)
+     */
+    String encodeUrl(String url);
+
+    /**
+     * Let extensions modify the HTML tag attributes.
+     *
+     * @param node the node for which the attributes are applied
+     * @param tagName the HTML tag name that these attributes are for (e.g. {@code h1}, {@code pre}, {@code code}).
+     * @param attributes the attributes that were calculated by the renderer
+     * @return the extended attributes with added/updated/removed entries
+     */
+    Map<String, String> extendAttributes(Node node, String tagName, Map<String, String> attributes);
+
+    /**
+     * @return the HTML writer to use
+     */
+    HtmlWriter getWriter();
+
+    /**
+     * @return HTML that should be rendered for a soft line break
+     */
+    String getSoftbreak();
+
+    /**
+     * Render the specified node and its children using the configured renderers. This should be used to render child
+     * nodes; be careful not to pass the node that is being rendered, that would result in an endless loop.
+     *
+     * @param node the node to render
+     */
+    void render(Node node);
+
+    /**
+     * @return whether HTML blocks and tags should be escaped or not
+     */
+    boolean shouldEscapeHtml();
+
+    /**
+     * @return true if the {@link UrlSanitizer} should be used.
+     * @since 0.14.0
+     */
+    boolean shouldSanitizeUrls();
+
+    /**
+     * @return Sanitizer to use for securing {@link Link} href and {@link Image} src if {@link #shouldSanitizeUrls()} is true.
+     * @since 0.14.0
+     */
+    UrlSanitizer urlSanitizer();
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlNodeRendererFactory.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlNodeRendererFactory.java
new file mode 100644
index 00000000000..c86d976ae0b
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlNodeRendererFactory.java
@@ -0,0 +1,49 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+
+/**
+ * Factory for instantiating new node renderers when rendering is done.
+ */
+public interface HtmlNodeRendererFactory {
+
+    /**
+     * Create a new node renderer for the specified rendering context.
+     *
+     * @param context the context for rendering (normally passed on to the node renderer)
+     * @return a node renderer
+     */
+    NodeRenderer create(HtmlNodeRendererContext context);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlRenderer.java
new file mode 100644
index 00000000000..d4b5214211a
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlRenderer.java
@@ -0,0 +1,337 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+import jdk.internal.org.commonmark.Extension;
+import jdk.internal.org.commonmark.internal.renderer.NodeRendererMap;
+import jdk.internal.org.commonmark.internal.util.Escaping;
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+import jdk.internal.org.commonmark.renderer.Renderer;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Renders a tree of nodes to HTML.
+ * <p>
+ * Start with the {@link #builder} method to configure the renderer. Example:
+ * <pre><code>
+ * HtmlRenderer renderer = HtmlRenderer.builder().escapeHtml(true).build();
+ * renderer.render(node);
+ * </code></pre>
+ */
+public class HtmlRenderer implements Renderer {
+
+    private final String softbreak;
+    private final boolean escapeHtml;
+    private final boolean sanitizeUrls;
+    private final UrlSanitizer urlSanitizer;
+    private final boolean percentEncodeUrls;
+    private final List<AttributeProviderFactory> attributeProviderFactories;
+    private final List<HtmlNodeRendererFactory> nodeRendererFactories;
+
+    private HtmlRenderer(Builder builder) {
+        this.softbreak = builder.softbreak;
+        this.escapeHtml = builder.escapeHtml;
+        this.sanitizeUrls = builder.sanitizeUrls;
+        this.percentEncodeUrls = builder.percentEncodeUrls;
+        this.urlSanitizer = builder.urlSanitizer;
+        this.attributeProviderFactories = new ArrayList<>(builder.attributeProviderFactories);
+
+        this.nodeRendererFactories = new ArrayList<>(builder.nodeRendererFactories.size() + 1);
+        this.nodeRendererFactories.addAll(builder.nodeRendererFactories);
+        // Add as last. This means clients can override the rendering of core nodes if they want.
+        this.nodeRendererFactories.add(new HtmlNodeRendererFactory() {
+            @Override
+            public NodeRenderer create(HtmlNodeRendererContext context) {
+                return new CoreHtmlNodeRenderer(context);
+            }
+        });
+    }
+
+    /**
+     * Create a new builder for configuring an {@link HtmlRenderer}.
+     *
+     * @return a builder
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    @Override
+    public void render(Node node, Appendable output) {
+        if (node == null) {
+            throw new NullPointerException("node must not be null");
+        }
+        RendererContext context = new RendererContext(new HtmlWriter(output));
+        context.render(node);
+    }
+
+    @Override
+    public String render(Node node) {
+        if (node == null) {
+            throw new NullPointerException("node must not be null");
+        }
+        StringBuilder sb = new StringBuilder();
+        render(node, sb);
+        return sb.toString();
+    }
+
+    /**
+     * Builder for configuring an {@link HtmlRenderer}. See methods for default configuration.
+     */
+    public static class Builder {
+
+        private String softbreak = "\n";
+        private boolean escapeHtml = false;
+        private boolean sanitizeUrls = false;
+        private UrlSanitizer urlSanitizer = new DefaultUrlSanitizer();
+        private boolean percentEncodeUrls = false;
+        private List<AttributeProviderFactory> attributeProviderFactories = new ArrayList<>();
+        private List<HtmlNodeRendererFactory> nodeRendererFactories = new ArrayList<>();
+
+        /**
+         * @return the configured {@link HtmlRenderer}
+         */
+        public HtmlRenderer build() {
+            return new HtmlRenderer(this);
+        }
+
+        /**
+         * The HTML to use for rendering a softbreak, defaults to {@code "\n"} (meaning the rendered result doesn't have
+         * a line break).
+         * <p>
+         * Set it to {@code "<br>"} (or {@code "<br />"} to make them hard breaks.
+         * <p>
+         * Set it to {@code " "} to ignore line wrapping in the source.
+         *
+         * @param softbreak HTML for softbreak
+         * @return {@code this}
+         */
+        public Builder softbreak(String softbreak) {
+            this.softbreak = softbreak;
+            return this;
+        }
+
+        /**
+         * Whether {@link HtmlInline} and {@link HtmlBlock} should be escaped, defaults to {@code false}.
+         * <p>
+         * Note that {@link HtmlInline} is only a tag itself, not the text between an opening tag and a closing tag. So
+         * markup in the text will be parsed as normal and is not affected by this option.
+         *
+         * @param escapeHtml true for escaping, false for preserving raw HTML
+         * @return {@code this}
+         */
+        public Builder escapeHtml(boolean escapeHtml) {
+            this.escapeHtml = escapeHtml;
+            return this;
+        }
+
+        /**
+         * Whether {@link Image} src and {@link Link} href should be sanitized, defaults to {@code false}.
+         *
+         * @param sanitizeUrls true for sanitization, false for preserving raw attribute
+         * @return {@code this}
+         * @since 0.14.0
+         */
+        public Builder sanitizeUrls(boolean sanitizeUrls) {
+            this.sanitizeUrls = sanitizeUrls;
+            return this;
+        }
+
+        /**
+         * {@link UrlSanitizer} used to filter URL's if {@link #sanitizeUrls} is true.
+         *
+         * @param urlSanitizer Filterer used to filter {@link Image} src and {@link Link}.
+         * @return {@code this}
+         * @since 0.14.0
+         */
+        public Builder urlSanitizer(UrlSanitizer urlSanitizer) {
+            this.urlSanitizer = urlSanitizer;
+            return this;
+        }
+
+        /**
+         * Whether URLs of link or images should be percent-encoded, defaults to {@code false}.
+         * <p>
+         * If enabled, the following is done:
+         * <ul>
+         * <li>Existing percent-encoded parts are preserved (e.g. "%20" is kept as "%20")</li>
+         * <li>Reserved characters such as "/" are preserved, except for "[" and "]" (see encodeURI in JS)</li>
+         * <li>Unreserved characters such as "a" are preserved</li>
+         * <li>Other characters such umlauts are percent-encoded</li>
+         * </ul>
+         *
+         * @param percentEncodeUrls true to percent-encode, false for leaving as-is
+         * @return {@code this}
+         */
+        public Builder percentEncodeUrls(boolean percentEncodeUrls) {
+            this.percentEncodeUrls = percentEncodeUrls;
+            return this;
+        }
+
+        /**
+         * Add a factory for an attribute provider for adding/changing HTML attributes to the rendered tags.
+         *
+         * @param attributeProviderFactory the attribute provider factory to add
+         * @return {@code this}
+         */
+        public Builder attributeProviderFactory(AttributeProviderFactory attributeProviderFactory) {
+            if (attributeProviderFactory == null) {
+                throw new NullPointerException("attributeProviderFactory must not be null");
+            }
+            this.attributeProviderFactories.add(attributeProviderFactory);
+            return this;
+        }
+
+        /**
+         * Add a factory for instantiating a node renderer (done when rendering). This allows to override the rendering
+         * of node types or define rendering for custom node types.
+         * <p>
+         * If multiple node renderers for the same node type are created, the one from the factory that was added first
+         * "wins". (This is how the rendering for core node types can be overridden; the default rendering comes last.)
+         *
+         * @param nodeRendererFactory the factory for creating a node renderer
+         * @return {@code this}
+         */
+        public Builder nodeRendererFactory(HtmlNodeRendererFactory nodeRendererFactory) {
+            if (nodeRendererFactory == null) {
+                throw new NullPointerException("nodeRendererFactory must not be null");
+            }
+            this.nodeRendererFactories.add(nodeRendererFactory);
+            return this;
+        }
+
+        /**
+         * @param extensions extensions to use on this HTML renderer
+         * @return {@code this}
+         */
+        public Builder extensions(Iterable<? extends Extension> extensions) {
+            if (extensions == null) {
+                throw new NullPointerException("extensions must not be null");
+            }
+            for (Extension extension : extensions) {
+                if (extension instanceof HtmlRendererExtension) {
+                    HtmlRendererExtension htmlRendererExtension = (HtmlRendererExtension) extension;
+                    htmlRendererExtension.extend(this);
+                }
+            }
+            return this;
+        }
+    }
+
+    /**
+     * Extension for {@link HtmlRenderer}.
+     */
+    public interface HtmlRendererExtension extends Extension {
+        void extend(Builder rendererBuilder);
+    }
+
+    private class RendererContext implements HtmlNodeRendererContext, AttributeProviderContext {
+
+        private final HtmlWriter htmlWriter;
+        private final List<AttributeProvider> attributeProviders;
+        private final NodeRendererMap nodeRendererMap = new NodeRendererMap();
+
+        private RendererContext(HtmlWriter htmlWriter) {
+            this.htmlWriter = htmlWriter;
+
+            attributeProviders = new ArrayList<>(attributeProviderFactories.size());
+            for (AttributeProviderFactory attributeProviderFactory : attributeProviderFactories) {
+                attributeProviders.add(attributeProviderFactory.create(this));
+            }
+
+            // The first node renderer for a node type "wins".
+            for (int i = nodeRendererFactories.size() - 1; i >= 0; i--) {
+                HtmlNodeRendererFactory nodeRendererFactory = nodeRendererFactories.get(i);
+                NodeRenderer nodeRenderer = nodeRendererFactory.create(this);
+                nodeRendererMap.add(nodeRenderer);
+            }
+        }
+
+        @Override
+        public boolean shouldEscapeHtml() {
+            return escapeHtml;
+        }
+
+        @Override
+        public boolean shouldSanitizeUrls() {
+            return sanitizeUrls;
+        }
+
+        @Override
+        public UrlSanitizer urlSanitizer() {
+            return urlSanitizer;
+        }
+
+        @Override
+        public String encodeUrl(String url) {
+            if (percentEncodeUrls) {
+                return Escaping.percentEncodeUrl(url);
+            } else {
+                return url;
+            }
+        }
+
+        @Override
+        public Map<String, String> extendAttributes(Node node, String tagName, Map<String, String> attributes) {
+            Map<String, String> attrs = new LinkedHashMap<>(attributes);
+            setCustomAttributes(node, tagName, attrs);
+            return attrs;
+        }
+
+        @Override
+        public HtmlWriter getWriter() {
+            return htmlWriter;
+        }
+
+        @Override
+        public String getSoftbreak() {
+            return softbreak;
+        }
+
+        @Override
+        public void render(Node node) {
+            nodeRendererMap.render(node);
+        }
+
+        private void setCustomAttributes(Node node, String tagName, Map<String, String> attrs) {
+            for (AttributeProvider attributeProvider : attributeProviders) {
+                attributeProvider.setAttributes(node, tagName, attrs);
+            }
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlWriter.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlWriter.java
new file mode 100644
index 00000000000..341c428a3ee
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlWriter.java
@@ -0,0 +1,107 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+import jdk.internal.org.commonmark.internal.util.Escaping;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+
+public class HtmlWriter {
+
+    private static final Map<String, String> NO_ATTRIBUTES = Collections.emptyMap();
+
+    private final Appendable buffer;
+    private char lastChar = 0;
+
+    public HtmlWriter(Appendable out) {
+        if (out == null) {
+            throw new NullPointerException("out must not be null");
+        }
+        this.buffer = out;
+    }
+
+    public void raw(String s) {
+        append(s);
+    }
+
+    public void text(String text) {
+        append(Escaping.escapeHtml(text));
+    }
+
+    public void tag(String name) {
+        tag(name, NO_ATTRIBUTES);
+    }
+
+    public void tag(String name, Map<String, String> attrs) {
+        tag(name, attrs, false);
+    }
+
+    public void tag(String name, Map<String, String> attrs, boolean voidElement) {
+        append("<");
+        append(name);
+        if (attrs != null && !attrs.isEmpty()) {
+            for (Map.Entry<String, String> attrib : attrs.entrySet()) {
+                append(" ");
+                append(Escaping.escapeHtml(attrib.getKey()));
+                append("=\"");
+                append(Escaping.escapeHtml(attrib.getValue()));
+                append("\"");
+            }
+        }
+        if (voidElement) {
+            append(" /");
+        }
+
+        append(">");
+    }
+
+    public void line() {
+        if (lastChar != 0 && lastChar != '\n') {
+            append("\n");
+        }
+    }
+
+    protected void append(String s) {
+        try {
+            buffer.append(s);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        int length = s.length();
+        if (length != 0) {
+            lastChar = s.charAt(length - 1);
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/UrlSanitizer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/UrlSanitizer.java
new file mode 100644
index 00000000000..12c69a73821
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/UrlSanitizer.java
@@ -0,0 +1,62 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+import jdk.internal.org.commonmark.node.Image;
+import jdk.internal.org.commonmark.node.Link;
+
+/**
+ * Sanitizes urls for img and a elements by whitelisting protocols.
+ * This is intended to prevent XSS payloads like [Click this totally safe url](javascript:document.xss=true;)
+ * <p>
+ * Implementation based on https://github.com/OWASP/java-html-sanitizer/blob/f07e44b034a45d94d6fd010279073c38b6933072/src/main/java/org/owasp/html/FilterUrlByProtocolAttributePolicy.java
+ *
+ * @since 0.14.0
+ */
+public interface UrlSanitizer {
+    /**
+     * Sanitize a url for use in the href attribute of a {@link Link}.
+     *
+     * @param url Link to sanitize
+     * @return Sanitized link
+     */
+    String sanitizeLinkUrl(String url);
+
+    /**
+     * Sanitize a url for use in the src attribute of a {@link Image}.
+     *
+     * @param url Link to sanitize
+     * @return Sanitized link {@link Image}
+     */
+    String sanitizeImageUrl(String url);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/package-info.java
new file mode 100644
index 00000000000..41dd2c6c6cc
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * HTML rendering (see {@link org.commonmark.renderer.html.HtmlRenderer})
+ */
+package jdk.internal.org.commonmark.renderer.html;
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/CoreMarkdownNodeRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/CoreMarkdownNodeRenderer.java
new file mode 100644
index 00000000000..4d543ea1174
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/CoreMarkdownNodeRenderer.java
@@ -0,0 +1,582 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.markdown;
+
+import jdk.internal.org.commonmark.text.AsciiMatcher;
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.text.CharMatcher;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+import jdk.internal.org.commonmark.text.Characters;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * The node renderer that renders all the core nodes (comes last in the order of node renderers).
+ * <p>
+ * Note that while sometimes it would be easier to record what kind of syntax was used on parsing (e.g. ATX vs Setext
+ * heading), this renderer is intended to also work for documents that were created by directly creating
+ * {@link Node Nodes} instead. So in order to support that, it sometimes needs to do a bit more work.
+ */
+public class CoreMarkdownNodeRenderer extends AbstractVisitor implements NodeRenderer {
+
+    private final AsciiMatcher textEscape;
+    private final CharMatcher textEscapeInHeading;
+    private final CharMatcher linkDestinationNeedsAngleBrackets =
+            AsciiMatcher.builder().c(' ').c('(').c(')').c('<').c('>').c('\n').c('\\').build();
+    private final CharMatcher linkDestinationEscapeInAngleBrackets =
+            AsciiMatcher.builder().c('<').c('>').c('\n').c('\\').build();
+    private final CharMatcher linkTitleEscapeInQuotes =
+            AsciiMatcher.builder().c('"').c('\n').c('\\').build();
+
+    private final Pattern orderedListMarkerPattern = Pattern.compile("^([0-9]{1,9})([.)])");
+
+    protected final MarkdownNodeRendererContext context;
+    private final MarkdownWriter writer;
+    /**
+     * If we're currently within a {@link BulletList} or {@link OrderedList}, this keeps the context of that list.
+     * It has a parent field so that it can represent a stack (for nested lists).
+     */
+    private ListHolder listHolder;
+
+    public CoreMarkdownNodeRenderer(MarkdownNodeRendererContext context) {
+        this.context = context;
+        this.writer = context.getWriter();
+
+        textEscape = AsciiMatcher.builder().anyOf("[]<>`*_&\n\\").anyOf(context.getSpecialCharacters()).build();
+        textEscapeInHeading = AsciiMatcher.builder(textEscape).anyOf("#").build();
+    }
+
+    @Override
+    public Set<Class<? extends Node>> getNodeTypes() {
+        return new HashSet<>(Arrays.asList(
+                BlockQuote.class,
+                BulletList.class,
+                Code.class,
+                Document.class,
+                Emphasis.class,
+                FencedCodeBlock.class,
+                HardLineBreak.class,
+                Heading.class,
+                HtmlBlock.class,
+                HtmlInline.class,
+                Image.class,
+                IndentedCodeBlock.class,
+                Link.class,
+                ListItem.class,
+                OrderedList.class,
+                Paragraph.class,
+                SoftLineBreak.class,
+                StrongEmphasis.class,
+                Text.class,
+                ThematicBreak.class
+        ));
+    }
+
+    @Override
+    public void render(Node node) {
+        node.accept(this);
+    }
+
+    @Override
+    public void visit(Document document) {
+        // No rendering itself
+        visitChildren(document);
+        writer.line();
+    }
+
+    @Override
+    public void visit(ThematicBreak thematicBreak) {
+        // Let's use ___ as it doesn't introduce ambiguity with * or - list item markers
+        writer.raw("___");
+        writer.block();
+    }
+
+    @Override
+    public void visit(Heading heading) {
+        if (heading.getLevel() <= 2) {
+            LineBreakVisitor lineBreakVisitor = new LineBreakVisitor();
+            heading.accept(lineBreakVisitor);
+            boolean isMultipleLines = lineBreakVisitor.hasLineBreak();
+
+            if (isMultipleLines) {
+                // Setext headings: Can have multiple lines, but only level 1 or 2
+                visitChildren(heading);
+                writer.line();
+                if (heading.getLevel() == 1) {
+                    // Note that it would be nice to match the length of the contents instead of just using 3, but that's
+                    // not easy.
+                    writer.raw("===");
+                } else {
+                    writer.raw("---");
+                }
+                writer.block();
+                return;
+            }
+        }
+
+        // ATX headings: Can't have multiple lines, but up to level 6.
+        for (int i = 0; i < heading.getLevel(); i++) {
+            writer.raw('#');
+        }
+        writer.raw(' ');
+        visitChildren(heading);
+
+        writer.block();
+    }
+
+    @Override
+    public void visit(IndentedCodeBlock indentedCodeBlock) {
+        String literal = indentedCodeBlock.getLiteral();
+        // We need to respect line prefixes which is why we need to write it line by line (e.g. an indented code block
+        // within a block quote)
+        writer.writePrefix("    ");
+        writer.pushPrefix("    ");
+        List<String> lines = getLines(literal);
+        for (int i = 0; i < lines.size(); i++) {
+            String line = lines.get(i);
+            writer.raw(line);
+            if (i != lines.size() - 1) {
+                writer.line();
+            }
+        }
+        writer.popPrefix();
+        writer.block();
+    }
+
+    @Override
+    public void visit(FencedCodeBlock codeBlock) {
+        String literal = codeBlock.getLiteral();
+        String fenceChar = codeBlock.getFenceCharacter() != null ? codeBlock.getFenceCharacter() : "`";
+        int openingFenceLength;
+        if (codeBlock.getOpeningFenceLength() != null) {
+            // If we have a known fence length, use it
+            openingFenceLength = codeBlock.getOpeningFenceLength();
+        } else {
+            // Otherwise, calculate the closing fence length pessimistically, e.g. if the code block itself contains a
+            // line with ```, we need to use a fence of length 4. If ``` occurs with non-whitespace characters on a
+            // line, we technically don't need a longer fence, but it's not incorrect to do so.
+            int fenceCharsInLiteral = findMaxRunLength(fenceChar, literal);
+            openingFenceLength = Math.max(fenceCharsInLiteral + 1, 3);
+        }
+        int closingFenceLength = codeBlock.getClosingFenceLength() != null ? codeBlock.getClosingFenceLength() : openingFenceLength;
+
+        String openingFence = repeat(fenceChar, openingFenceLength);
+        String closingFence = repeat(fenceChar, closingFenceLength);
+        int indent = codeBlock.getFenceIndent();
+
+        if (indent > 0) {
+            String indentPrefix = repeat(" ", indent);
+            writer.writePrefix(indentPrefix);
+            writer.pushPrefix(indentPrefix);
+        }
+
+        writer.raw(openingFence);
+        if (codeBlock.getInfo() != null) {
+            writer.raw(codeBlock.getInfo());
+        }
+        writer.line();
+        if (!literal.isEmpty()) {
+            List<String> lines = getLines(literal);
+            for (String line : lines) {
+                writer.raw(line);
+                writer.line();
+            }
+        }
+        writer.raw(closingFence);
+        if (indent > 0) {
+            writer.popPrefix();
+        }
+        writer.block();
+    }
+
+    @Override
+    public void visit(HtmlBlock htmlBlock) {
+        List<String> lines = getLines(htmlBlock.getLiteral());
+        for (int i = 0; i < lines.size(); i++) {
+            String line = lines.get(i);
+            writer.raw(line);
+            if (i != lines.size() - 1) {
+                writer.line();
+            }
+        }
+        writer.block();
+    }
+
+    @Override
+    public void visit(Paragraph paragraph) {
+        visitChildren(paragraph);
+        writer.block();
+    }
+
+    @Override
+    public void visit(BlockQuote blockQuote) {
+        writer.writePrefix("> ");
+        writer.pushPrefix("> ");
+        visitChildren(blockQuote);
+        writer.popPrefix();
+        writer.block();
+    }
+
+    @Override
+    public void visit(BulletList bulletList) {
+        writer.pushTight(bulletList.isTight());
+        listHolder = new BulletListHolder(listHolder, bulletList);
+        visitChildren(bulletList);
+        listHolder = listHolder.parent;
+        writer.popTight();
+        writer.block();
+    }
+
+    @Override
+    public void visit(OrderedList orderedList) {
+        writer.pushTight(orderedList.isTight());
+        listHolder = new OrderedListHolder(listHolder, orderedList);
+        visitChildren(orderedList);
+        listHolder = listHolder.parent;
+        writer.popTight();
+        writer.block();
+    }
+
+    @Override
+    public void visit(ListItem listItem) {
+        int markerIndent = listItem.getMarkerIndent() != null ? listItem.getMarkerIndent() : 0;
+        String marker;
+        if (listHolder instanceof BulletListHolder) {
+            BulletListHolder bulletListHolder = (BulletListHolder) listHolder;
+            marker = repeat(" ", markerIndent) + bulletListHolder.marker;
+        } else if (listHolder instanceof OrderedListHolder) {
+            OrderedListHolder orderedListHolder = (OrderedListHolder) listHolder;
+            marker = repeat(" ", markerIndent) + orderedListHolder.number + orderedListHolder.delimiter;
+            orderedListHolder.number++;
+        } else {
+            throw new IllegalStateException("Unknown list holder type: " + listHolder);
+        }
+        Integer contentIndent = listItem.getContentIndent();
+        String spaces = contentIndent != null ? repeat(" ", contentIndent - marker.length()) : " ";
+        writer.writePrefix(marker);
+        writer.writePrefix(spaces);
+        writer.pushPrefix(repeat(" ", marker.length() + spaces.length()));
+
+        if (listItem.getFirstChild() == null) {
+            // Empty list item
+            writer.block();
+        } else {
+            visitChildren(listItem);
+        }
+
+        writer.popPrefix();
+    }
+
+    @Override
+    public void visit(Code code) {
+        String literal = code.getLiteral();
+        // If the literal includes backticks, we can surround them by using one more backtick.
+        int backticks = findMaxRunLength("`", literal);
+        for (int i = 0; i < backticks + 1; i++) {
+            writer.raw('`');
+        }
+        // If the literal starts or ends with a backtick, surround it with a single space.
+        // If it starts and ends with a space (but is not only spaces), add an additional space (otherwise they would
+        // get removed on parsing).
+        boolean addSpace = literal.startsWith("`") || literal.endsWith("`") ||
+                (literal.startsWith(" ") && literal.endsWith(" ") && Characters.hasNonSpace(literal));
+        if (addSpace) {
+            writer.raw(' ');
+        }
+        writer.raw(literal);
+        if (addSpace) {
+            writer.raw(' ');
+        }
+        for (int i = 0; i < backticks + 1; i++) {
+            writer.raw('`');
+        }
+    }
+
+    @Override
+    public void visit(Emphasis emphasis) {
+        String delimiter = emphasis.getOpeningDelimiter();
+        // Use delimiter that was parsed if available
+        if (delimiter == null) {
+            // When emphasis is nested, a different delimiter needs to be used
+            delimiter = writer.getLastChar() == '*' ? "_" : "*";
+        }
+        writer.raw(delimiter);
+        super.visit(emphasis);
+        writer.raw(delimiter);
+    }
+
+    @Override
+    public void visit(StrongEmphasis strongEmphasis) {
+        writer.raw("**");
+        super.visit(strongEmphasis);
+        writer.raw("**");
+    }
+
+    @Override
+    public void visit(Link link) {
+        writeLinkLike(link.getTitle(), link.getDestination(), link, "[");
+    }
+
+    @Override
+    public void visit(Image image) {
+        writeLinkLike(image.getTitle(), image.getDestination(), image, "![");
+    }
+
+    @Override
+    public void visit(HtmlInline htmlInline) {
+        writer.raw(htmlInline.getLiteral());
+    }
+
+    @Override
+    public void visit(HardLineBreak hardLineBreak) {
+        writer.raw("  ");
+        writer.line();
+    }
+
+    @Override
+    public void visit(SoftLineBreak softLineBreak) {
+        writer.line();
+    }
+
+    @Override
+    public void visit(Text text) {
+        // Text is tricky. In Markdown special characters (`-`, `#` etc.) can be escaped (`\-`, `\#` etc.) so that
+        // they're parsed as plain text. Currently, whether a character was escaped or not is not recorded in the Node,
+        // so here we don't know. If we just wrote out those characters unescaped, the resulting Markdown would change
+        // meaning (turn into a list item, heading, etc.).
+        // You might say "Why not store that in the Node when parsing", but that wouldn't work for the use case where
+        // nodes are constructed directly instead of via parsing. This renderer needs to work for that too.
+        // So currently, when in doubt, we escape. For special characters only occurring at the beginning of a line,
+        // we only escape them then (we wouldn't want to escape every `.` for example).
+        String literal = text.getLiteral();
+        if (writer.isAtLineStart() && !literal.isEmpty()) {
+            char c = literal.charAt(0);
+            switch (c) {
+                case '-': {
+                    // Would be ambiguous with a bullet list marker, escape
+                    writer.raw("\\-");
+                    literal = literal.substring(1);
+                    break;
+                }
+                case '#': {
+                    // Would be ambiguous with an ATX heading, escape
+                    writer.raw("\\#");
+                    literal = literal.substring(1);
+                    break;
+                }
+                case '=': {
+                    // Would be ambiguous with a Setext heading, escape
+                    writer.raw("\\=");
+                    literal = literal.substring(1);
+                    break;
+                }
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9': {
+                    // Check for ordered list marker
+                    Matcher m = orderedListMarkerPattern.matcher(literal);
+                    if (m.find()) {
+                        writer.raw(m.group(1));
+                        writer.raw("\\" + m.group(2));
+                        literal = literal.substring(m.end());
+                    }
+                    break;
+                }
+                case '\t': {
+                    writer.raw("&#9;");
+                    literal = literal.substring(1);
+                    break;
+                }
+                case ' ': {
+                    writer.raw("&#32;");
+                    literal = literal.substring(1);
+                    break;
+                }
+            }
+        }
+
+        CharMatcher escape = text.getParent() instanceof Heading ? textEscapeInHeading : textEscape;
+
+        if (literal.endsWith("!") && text.getNext() instanceof Link) {
+            // If we wrote the `!` unescaped, it would turn the link into an image instead.
+            writer.text(literal.substring(0, literal.length() - 1), escape);
+            writer.raw("\\!");
+        } else {
+            writer.text(literal, escape);
+        }
+    }
+
+    @Override
+    protected void visitChildren(Node parent) {
+        Node node = parent.getFirstChild();
+        while (node != null) {
+            Node next = node.getNext();
+            context.render(node);
+            node = next;
+        }
+    }
+
+    private static int findMaxRunLength(String needle, String s) {
+        int maxRunLength = 0;
+        int pos = 0;
+        while (pos < s.length()) {
+            pos = s.indexOf(needle, pos);
+            if (pos == -1) {
+                return maxRunLength;
+            }
+            int runLength = 0;
+            do {
+                pos += needle.length();
+                runLength++;
+            } while (s.startsWith(needle, pos));
+            maxRunLength = Math.max(runLength, maxRunLength);
+        }
+        return maxRunLength;
+    }
+
+    private static boolean contains(String s, CharMatcher charMatcher) {
+        for (int i = 0; i < s.length(); i++) {
+            if (charMatcher.matches(s.charAt(i))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    // Keep for Android compat (String.repeat only available on Android 12 and later)
+    private static String repeat(String s, int count) {
+        StringBuilder sb = new StringBuilder(s.length() * count);
+        for (int i = 0; i < count; i++) {
+            sb.append(s);
+        }
+        return sb.toString();
+    }
+
+    private static List<String> getLines(String literal) {
+        // Without -1, split would discard all trailing empty strings, which is not what we want, e.g. it would
+        // return the same result for "abc", "abc\n" and "abc\n\n".
+        // With -1, it returns ["abc"], ["abc", ""] and ["abc", "", ""].
+        String[] parts = literal.split("\n", -1);
+        if (parts[parts.length - 1].isEmpty()) {
+            // But we don't want the last empty string, as "\n" is used as a line terminator (not a separator),
+            // so return without the last element.
+            return Arrays.asList(parts).subList(0, parts.length - 1);
+        } else {
+            return Arrays.asList(parts);
+        }
+    }
+
+    private void writeLinkLike(String title, String destination, Node node, String opener) {
+        writer.raw(opener);
+        visitChildren(node);
+        writer.raw(']');
+        writer.raw('(');
+        if (contains(destination, linkDestinationNeedsAngleBrackets)) {
+            writer.raw('<');
+            writer.text(destination, linkDestinationEscapeInAngleBrackets);
+            writer.raw('>');
+        } else {
+            writer.raw(destination);
+        }
+        if (title != null) {
+            writer.raw(' ');
+            writer.raw('"');
+            writer.text(title, linkTitleEscapeInQuotes);
+            writer.raw('"');
+        }
+        writer.raw(')');
+    }
+
+    private static class ListHolder {
+        final ListHolder parent;
+
+        protected ListHolder(ListHolder parent) {
+            this.parent = parent;
+        }
+    }
+
+    private static class BulletListHolder extends ListHolder {
+        final String marker;
+
+        public BulletListHolder(ListHolder parent, BulletList bulletList) {
+            super(parent);
+            this.marker = bulletList.getMarker() != null ? bulletList.getMarker() : "-";
+        }
+    }
+
+    private static class OrderedListHolder extends ListHolder {
+        final String delimiter;
+        private int number;
+
+        protected OrderedListHolder(ListHolder parent, OrderedList orderedList) {
+            super(parent);
+            delimiter = orderedList.getMarkerDelimiter() != null ? orderedList.getMarkerDelimiter() : ".";
+            number = orderedList.getMarkerStartNumber() != null ? orderedList.getMarkerStartNumber() : 1;
+        }
+    }
+
+    /**
+     * Visits nodes to check if there are any soft or hard line breaks.
+     */
+    private static class LineBreakVisitor extends AbstractVisitor {
+        private boolean lineBreak = false;
+
+        public boolean hasLineBreak() {
+            return lineBreak;
+        }
+
+        @Override
+        public void visit(SoftLineBreak softLineBreak) {
+            super.visit(softLineBreak);
+            lineBreak = true;
+        }
+
+        @Override
+        public void visit(HardLineBreak hardLineBreak) {
+            super.visit(hardLineBreak);
+            lineBreak = true;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownNodeRendererContext.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownNodeRendererContext.java
new file mode 100644
index 00000000000..e3f9dadb753
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownNodeRendererContext.java
@@ -0,0 +1,62 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.markdown;
+
+import jdk.internal.org.commonmark.node.Node;
+
+import java.util.Set;
+
+/**
+ * Context that is passed to custom node renderers, see {@link MarkdownNodeRendererFactory#create}.
+ */
+public interface MarkdownNodeRendererContext {
+
+    /**
+     * @return the writer to use
+     */
+    MarkdownWriter getWriter();
+
+    /**
+     * Render the specified node and its children using the configured renderers. This should be used to render child
+     * nodes; be careful not to pass the node that is being rendered, that would result in an endless loop.
+     *
+     * @param node the node to render
+     */
+    void render(Node node);
+
+    /**
+     * @return additional special characters that need to be escaped if they occur in normal text; currently only ASCII
+     * characters are allowed
+     */
+    Set<Character> getSpecialCharacters();
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownNodeRendererFactory.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownNodeRendererFactory.java
new file mode 100644
index 00000000000..c908398b7de
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownNodeRendererFactory.java
@@ -0,0 +1,57 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.markdown;
+
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+
+import java.util.Set;
+
+/**
+ * Factory for instantiating new node renderers for rendering custom nodes.
+ */
+public interface MarkdownNodeRendererFactory {
+
+    /**
+     * Create a new node renderer for the specified rendering context.
+     *
+     * @param context the context for rendering (normally passed on to the node renderer)
+     * @return a node renderer
+     */
+    NodeRenderer create(MarkdownNodeRendererContext context);
+
+    /**
+     * @return the additional special characters that this factory would like to have escaped in normal text; currently
+     * only ASCII characters are allowed
+     */
+    Set<Character> getSpecialCharacters();
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownRenderer.java
new file mode 100644
index 00000000000..344a176d0d5
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownRenderer.java
@@ -0,0 +1,195 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.markdown;
+
+import jdk.internal.org.commonmark.Extension;
+import jdk.internal.org.commonmark.internal.renderer.NodeRendererMap;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+import jdk.internal.org.commonmark.renderer.Renderer;
+
+import java.util.*;
+
+/**
+ * Renders nodes to Markdown (CommonMark syntax); use {@link #builder()} to create a renderer.
+ * <p>
+ * Note that it doesn't currently preserve the exact syntax of the original input Markdown (if any):
+ * <ul>
+ *     <li>Headings are output as ATX headings if possible (multi-line headings need Setext headings)</li>
+ *     <li>Links are always rendered as inline links (no support for reference links yet)</li>
+ *     <li>Escaping might be over-eager, e.g. a plain {@code *} might be escaped
+ *     even though it doesn't need to be in that particular context</li>
+ *     <li>Leading whitespace in paragraphs is not preserved</li>
+ * </ul>
+ * However, it should produce Markdown that is semantically equivalent to the input, i.e. if the Markdown was parsed
+ * again and compared against the original AST, it should be the same (minus bugs).
+ */
+public class MarkdownRenderer implements Renderer {
+
+    private final List<MarkdownNodeRendererFactory> nodeRendererFactories;
+
+    private MarkdownRenderer(Builder builder) {
+        this.nodeRendererFactories = new ArrayList<>(builder.nodeRendererFactories.size() + 1);
+        this.nodeRendererFactories.addAll(builder.nodeRendererFactories);
+        // Add as last. This means clients can override the rendering of core nodes if they want.
+        this.nodeRendererFactories.add(new MarkdownNodeRendererFactory() {
+            @Override
+            public NodeRenderer create(MarkdownNodeRendererContext context) {
+                return new CoreMarkdownNodeRenderer(context);
+            }
+
+            @Override
+            public Set<Character> getSpecialCharacters() {
+                return Collections.emptySet();
+            }
+        });
+    }
+
+    /**
+     * Create a new builder for configuring a {@link MarkdownRenderer}.
+     *
+     * @return a builder
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    @Override
+    public void render(Node node, Appendable output) {
+        RendererContext context = new RendererContext(new MarkdownWriter(output));
+        context.render(node);
+    }
+
+    @Override
+    public String render(Node node) {
+        StringBuilder sb = new StringBuilder();
+        render(node, sb);
+        return sb.toString();
+    }
+
+    /**
+     * Builder for configuring a {@link MarkdownRenderer}. See methods for default configuration.
+     */
+    public static class Builder {
+
+        private final List<MarkdownNodeRendererFactory> nodeRendererFactories = new ArrayList<>();
+
+        /**
+         * @return the configured {@link MarkdownRenderer}
+         */
+        public MarkdownRenderer build() {
+            return new MarkdownRenderer(this);
+        }
+
+        /**
+         * Add a factory for instantiating a node renderer (done when rendering). This allows to override the rendering
+         * of node types or define rendering for custom node types.
+         * <p>
+         * If multiple node renderers for the same node type are created, the one from the factory that was added first
+         * "wins". (This is how the rendering for core node types can be overridden; the default rendering comes last.)
+         *
+         * @param nodeRendererFactory the factory for creating a node renderer
+         * @return {@code this}
+         */
+        public Builder nodeRendererFactory(MarkdownNodeRendererFactory nodeRendererFactory) {
+            this.nodeRendererFactories.add(nodeRendererFactory);
+            return this;
+        }
+
+        /**
+         * @param extensions extensions to use on this renderer
+         * @return {@code this}
+         */
+        public Builder extensions(Iterable<? extends Extension> extensions) {
+            for (Extension extension : extensions) {
+                if (extension instanceof MarkdownRendererExtension) {
+                    MarkdownRendererExtension markdownRendererExtension = (MarkdownRendererExtension) extension;
+                    markdownRendererExtension.extend(this);
+                }
+            }
+            return this;
+        }
+    }
+
+    /**
+     * Extension for {@link MarkdownRenderer} for rendering custom nodes.
+     */
+    public interface MarkdownRendererExtension extends Extension {
+
+        /**
+         * Extend Markdown rendering, usually by registering custom node renderers using {@link Builder#nodeRendererFactory}.
+         *
+         * @param rendererBuilder the renderer builder to extend
+         */
+        void extend(Builder rendererBuilder);
+    }
+
+    private class RendererContext implements MarkdownNodeRendererContext {
+        private final MarkdownWriter writer;
+        private final NodeRendererMap nodeRendererMap = new NodeRendererMap();
+        private final Set<Character> additionalTextEscapes;
+
+        private RendererContext(MarkdownWriter writer) {
+            // Set fields that are used by interface
+            this.writer = writer;
+            Set<Character> escapes = new HashSet<Character>();
+            for (MarkdownNodeRendererFactory factory : nodeRendererFactories) {
+                escapes.addAll(factory.getSpecialCharacters());
+            }
+            additionalTextEscapes = Collections.unmodifiableSet(escapes);
+
+            // The first node renderer for a node type "wins".
+            for (int i = nodeRendererFactories.size() - 1; i >= 0; i--) {
+                MarkdownNodeRendererFactory nodeRendererFactory = nodeRendererFactories.get(i);
+                // Pass in this as context here, which uses the fields set above
+                NodeRenderer nodeRenderer = nodeRendererFactory.create(this);
+                nodeRendererMap.add(nodeRenderer);
+            }
+        }
+
+        @Override
+        public MarkdownWriter getWriter() {
+            return writer;
+        }
+
+        @Override
+        public void render(Node node) {
+            nodeRendererMap.render(node);
+        }
+
+        @Override
+        public Set<Character> getSpecialCharacters() {
+            return additionalTextEscapes;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownWriter.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownWriter.java
new file mode 100644
index 00000000000..b91fdd6b1b5
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownWriter.java
@@ -0,0 +1,278 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.markdown;
+
+import jdk.internal.org.commonmark.text.CharMatcher;
+
+import java.io.IOException;
+import java.util.LinkedList;
+
+/**
+ * Writer for Markdown (CommonMark) text.
+ */
+public class MarkdownWriter {
+
+    private final Appendable buffer;
+
+    private int blockSeparator = 0;
+    private char lastChar;
+    private boolean atLineStart = true;
+
+    // Stacks of settings that affect various rendering behaviors. The common pattern here is that callers use "push" to
+    // change a setting, render some nodes, and then "pop" the setting off the stack again to restore previous state.
+    private final LinkedList<String> prefixes = new LinkedList<>();
+    private final LinkedList<Boolean> tight = new LinkedList<>();
+    private final LinkedList<CharMatcher> rawEscapes = new LinkedList<>();
+
+    public MarkdownWriter(Appendable out) {
+        buffer = out;
+    }
+
+    /**
+     * Write the supplied string (raw/unescaped except if {@link #pushRawEscape} was used).
+     */
+    public void raw(String s) {
+        flushBlockSeparator();
+        write(s, null);
+    }
+
+    /**
+     * Write the supplied character (raw/unescaped except if {@link #pushRawEscape} was used).
+     */
+    public void raw(char c) {
+        flushBlockSeparator();
+        write(c);
+    }
+
+    /**
+     * Write the supplied string with escaping.
+     *
+     * @param s      the string to write
+     * @param escape which characters to escape
+     */
+    public void text(String s, CharMatcher escape) {
+        if (s.isEmpty()) {
+            return;
+        }
+        flushBlockSeparator();
+        write(s, escape);
+
+        lastChar = s.charAt(s.length() - 1);
+        atLineStart = false;
+    }
+
+    /**
+     * Write a newline (line terminator).
+     */
+    public void line() {
+        write('\n');
+        writePrefixes();
+        atLineStart = true;
+    }
+
+    /**
+     * Enqueue a block separator to be written before the next text is written. Block separators are not written
+     * straight away because if there are no more blocks to write we don't want a separator (at the end of the document).
+     */
+    public void block() {
+        // Remember whether this should be a tight or loose separator now because tight could get changed in between
+        // this and the next flush.
+        blockSeparator = isTight() ? 1 : 2;
+        atLineStart = true;
+    }
+
+    /**
+     * Push a prefix onto the top of the stack. All prefixes are written at the beginning of each line, until the
+     * prefix is popped again.
+     *
+     * @param prefix the raw prefix string
+     */
+    public void pushPrefix(String prefix) {
+        prefixes.addLast(prefix);
+    }
+
+    /**
+     * Write a prefix.
+     *
+     * @param prefix the raw prefix string to write
+     */
+    public void writePrefix(String prefix) {
+        boolean tmp = atLineStart;
+        raw(prefix);
+        atLineStart = tmp;
+    }
+
+    /**
+     * Remove the last prefix from the top of the stack.
+     */
+    public void popPrefix() {
+        prefixes.removeLast();
+    }
+
+    /**
+     * Change whether blocks are tight or loose. Loose is the default where blocks are separated by a blank line. Tight
+     * is where blocks are not separated by a blank line. Tight blocks are used in lists, if there are no blank lines
+     * within the list.
+     * <p>
+     * Note that changing this does not affect block separators that have already been enqueued with {@link #block()},
+     * only future ones.
+     */
+    public void pushTight(boolean tight) {
+        this.tight.addLast(tight);
+    }
+
+    /**
+     * Remove the last "tight" setting from the top of the stack.
+     */
+    public void popTight() {
+        this.tight.removeLast();
+    }
+
+    /**
+     * Escape the characters matching the supplied matcher, in all text (text and raw). This might be useful to
+     * extensions that add another layer of syntax, e.g. the tables extension that uses `|` to separate cells and needs
+     * all `|` characters to be escaped (even in code spans).
+     *
+     * @param rawEscape the characters to escape in raw text
+     */
+    public void pushRawEscape(CharMatcher rawEscape) {
+        rawEscapes.add(rawEscape);
+    }
+
+    /**
+     * Remove the last raw escape from the top of the stack.
+     */
+    public void popRawEscape() {
+        rawEscapes.removeLast();
+    }
+
+    /**
+     * @return the last character that was written
+     */
+    public char getLastChar() {
+        return lastChar;
+    }
+
+    /**
+     * @return whether we're at the line start (not counting any prefixes), i.e. after a {@link #line} or {@link #block}.
+     */
+    public boolean isAtLineStart() {
+        return atLineStart;
+    }
+
+    private void write(String s, CharMatcher escape) {
+        try {
+            if (rawEscapes.isEmpty() && escape == null) {
+                // Normal fast path
+                buffer.append(s);
+            } else {
+                for (int i = 0; i < s.length(); i++) {
+                    append(s.charAt(i), escape);
+                }
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        int length = s.length();
+        if (length != 0) {
+            lastChar = s.charAt(length - 1);
+        }
+        atLineStart = false;
+    }
+
+    private void write(char c) {
+        try {
+            append(c, null);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        lastChar = c;
+        atLineStart = false;
+    }
+
+    private void writePrefixes() {
+        if (!prefixes.isEmpty()) {
+            for (String prefix : prefixes) {
+                write(prefix, null);
+            }
+        }
+    }
+
+    /**
+     * If a block separator has been enqueued with {@link #block()} but not yet written, write it now.
+     */
+    private void flushBlockSeparator() {
+        if (blockSeparator != 0) {
+            write('\n');
+            writePrefixes();
+            if (blockSeparator > 1) {
+                write('\n');
+                writePrefixes();
+            }
+            blockSeparator = 0;
+        }
+    }
+
+    private void append(char c, CharMatcher escape) throws IOException {
+        if (needsEscaping(c, escape)) {
+            if (c == '\n') {
+                // Can't escape this with \, use numeric character reference
+                buffer.append("&#10;");
+            } else {
+                buffer.append('\\');
+                buffer.append(c);
+            }
+        } else {
+            buffer.append(c);
+        }
+    }
+
+    private boolean isTight() {
+        return !tight.isEmpty() && tight.getLast();
+    }
+
+    private boolean needsEscaping(char c, CharMatcher escape) {
+        return (escape != null && escape.matches(c)) || rawNeedsEscaping(c);
+    }
+
+    private boolean rawNeedsEscaping(char c) {
+        for (CharMatcher rawEscape : rawEscapes) {
+            if (rawEscape.matches(c)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/package-info.java
new file mode 100644
index 00000000000..2db58aca257
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * Markdown rendering (see {@link org.commonmark.renderer.markdown.MarkdownRenderer})
+ */
+package jdk.internal.org.commonmark.renderer.markdown;
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/CoreTextContentNodeRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/CoreTextContentNodeRenderer.java
new file mode 100644
index 00000000000..1321d5ad785
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/CoreTextContentNodeRenderer.java
@@ -0,0 +1,312 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.text;
+
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+import jdk.internal.org.commonmark.internal.renderer.text.BulletListHolder;
+import jdk.internal.org.commonmark.internal.renderer.text.ListHolder;
+import jdk.internal.org.commonmark.internal.renderer.text.OrderedListHolder;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * The node renderer that renders all the core nodes (comes last in the order of node renderers).
+ */
+public class CoreTextContentNodeRenderer extends AbstractVisitor implements NodeRenderer {
+
+    protected final TextContentNodeRendererContext context;
+    private final TextContentWriter textContent;
+
+    private ListHolder listHolder;
+
+    public CoreTextContentNodeRenderer(TextContentNodeRendererContext context) {
+        this.context = context;
+        this.textContent = context.getWriter();
+    }
+
+    @Override
+    public Set<Class<? extends Node>> getNodeTypes() {
+        return new HashSet<>(Arrays.asList(
+                Document.class,
+                Heading.class,
+                Paragraph.class,
+                BlockQuote.class,
+                BulletList.class,
+                FencedCodeBlock.class,
+                HtmlBlock.class,
+                ThematicBreak.class,
+                IndentedCodeBlock.class,
+                Link.class,
+                ListItem.class,
+                OrderedList.class,
+                Image.class,
+                Emphasis.class,
+                StrongEmphasis.class,
+                Text.class,
+                Code.class,
+                HtmlInline.class,
+                SoftLineBreak.class,
+                HardLineBreak.class
+        ));
+    }
+
+    @Override
+    public void render(Node node) {
+        node.accept(this);
+    }
+
+    @Override
+    public void visit(Document document) {
+        // No rendering itself
+        visitChildren(document);
+    }
+
+    @Override
+    public void visit(BlockQuote blockQuote) {
+        textContent.write('\u00ab');
+        visitChildren(blockQuote);
+        textContent.write('\u00bb');
+
+        writeEndOfLineIfNeeded(blockQuote, null);
+    }
+
+    @Override
+    public void visit(BulletList bulletList) {
+        if (listHolder != null) {
+            writeEndOfLine();
+        }
+        listHolder = new BulletListHolder(listHolder, bulletList);
+        visitChildren(bulletList);
+        writeEndOfLineIfNeeded(bulletList, null);
+        if (listHolder.getParent() != null) {
+            listHolder = listHolder.getParent();
+        } else {
+            listHolder = null;
+        }
+    }
+
+    @Override
+    public void visit(Code code) {
+        textContent.write('\"');
+        textContent.write(code.getLiteral());
+        textContent.write('\"');
+    }
+
+    @Override
+    public void visit(FencedCodeBlock fencedCodeBlock) {
+        if (context.stripNewlines()) {
+            textContent.writeStripped(fencedCodeBlock.getLiteral());
+            writeEndOfLineIfNeeded(fencedCodeBlock, null);
+        } else {
+            textContent.write(fencedCodeBlock.getLiteral());
+        }
+    }
+
+    @Override
+    public void visit(HardLineBreak hardLineBreak) {
+        writeEndOfLineIfNeeded(hardLineBreak, null);
+    }
+
+    @Override
+    public void visit(Heading heading) {
+        visitChildren(heading);
+        writeEndOfLineIfNeeded(heading, ':');
+    }
+
+    @Override
+    public void visit(ThematicBreak thematicBreak) {
+        if (!context.stripNewlines()) {
+            textContent.write("***");
+        }
+        writeEndOfLineIfNeeded(thematicBreak, null);
+    }
+
+    @Override
+    public void visit(HtmlInline htmlInline) {
+        writeText(htmlInline.getLiteral());
+    }
+
+    @Override
+    public void visit(HtmlBlock htmlBlock) {
+        writeText(htmlBlock.getLiteral());
+    }
+
+    @Override
+    public void visit(Image image) {
+        writeLink(image, image.getTitle(), image.getDestination());
+    }
+
+    @Override
+    public void visit(IndentedCodeBlock indentedCodeBlock) {
+        if (context.stripNewlines()) {
+            textContent.writeStripped(indentedCodeBlock.getLiteral());
+            writeEndOfLineIfNeeded(indentedCodeBlock, null);
+        } else {
+            textContent.write(indentedCodeBlock.getLiteral());
+        }
+    }
+
+    @Override
+    public void visit(Link link) {
+        writeLink(link, link.getTitle(), link.getDestination());
+    }
+
+    @Override
+    public void visit(ListItem listItem) {
+        if (listHolder != null && listHolder instanceof OrderedListHolder) {
+            OrderedListHolder orderedListHolder = (OrderedListHolder) listHolder;
+            String indent = context.stripNewlines() ? "" : orderedListHolder.getIndent();
+            textContent.write(indent + orderedListHolder.getCounter() + orderedListHolder.getDelimiter() + " ");
+            visitChildren(listItem);
+            writeEndOfLineIfNeeded(listItem, null);
+            orderedListHolder.increaseCounter();
+        } else if (listHolder != null && listHolder instanceof BulletListHolder) {
+            BulletListHolder bulletListHolder = (BulletListHolder) listHolder;
+            if (!context.stripNewlines()) {
+                textContent.write(bulletListHolder.getIndent() + bulletListHolder.getMarker() + " ");
+            }
+            visitChildren(listItem);
+            writeEndOfLineIfNeeded(listItem, null);
+        }
+    }
+
+    @Override
+    public void visit(OrderedList orderedList) {
+        if (listHolder != null) {
+            writeEndOfLine();
+        }
+        listHolder = new OrderedListHolder(listHolder, orderedList);
+        visitChildren(orderedList);
+        writeEndOfLineIfNeeded(orderedList, null);
+        if (listHolder.getParent() != null) {
+            listHolder = listHolder.getParent();
+        } else {
+            listHolder = null;
+        }
+    }
+
+    @Override
+    public void visit(Paragraph paragraph) {
+        visitChildren(paragraph);
+        // Add "end of line" only if its "root paragraph.
+        if (paragraph.getParent() == null || paragraph.getParent() instanceof Document) {
+            writeEndOfLineIfNeeded(paragraph, null);
+        }
+    }
+
+    @Override
+    public void visit(SoftLineBreak softLineBreak) {
+        writeEndOfLineIfNeeded(softLineBreak, null);
+    }
+
+    @Override
+    public void visit(Text text) {
+        writeText(text.getLiteral());
+    }
+
+    @Override
+    protected void visitChildren(Node parent) {
+        Node node = parent.getFirstChild();
+        while (node != null) {
+            Node next = node.getNext();
+            context.render(node);
+            node = next;
+        }
+    }
+
+    private void writeText(String text) {
+        if (context.stripNewlines()) {
+            textContent.writeStripped(text);
+        } else {
+            textContent.write(text);
+        }
+    }
+
+    private void writeLink(Node node, String title, String destination) {
+        boolean hasChild = node.getFirstChild() != null;
+        boolean hasTitle = title != null && !title.equals(destination);
+        boolean hasDestination = destination != null && !destination.equals("");
+
+        if (hasChild) {
+            textContent.write('"');
+            visitChildren(node);
+            textContent.write('"');
+            if (hasTitle || hasDestination) {
+                textContent.whitespace();
+                textContent.write('(');
+            }
+        }
+
+        if (hasTitle) {
+            textContent.write(title);
+            if (hasDestination) {
+                textContent.colon();
+                textContent.whitespace();
+            }
+        }
+
+        if (hasDestination) {
+            textContent.write(destination);
+        }
+
+        if (hasChild && (hasTitle || hasDestination)) {
+            textContent.write(')');
+        }
+    }
+
+    private void writeEndOfLineIfNeeded(Node node, Character c) {
+        if (context.stripNewlines()) {
+            if (c != null) {
+                textContent.write(c);
+            }
+            if (node.getNext() != null) {
+                textContent.whitespace();
+            }
+        } else {
+            if (node.getNext() != null) {
+                textContent.line();
+            }
+        }
+    }
+
+    private void writeEndOfLine() {
+        if (context.stripNewlines()) {
+            textContent.whitespace();
+        } else {
+            textContent.line();
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentNodeRendererContext.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentNodeRendererContext.java
new file mode 100644
index 00000000000..c00be3cca41
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentNodeRendererContext.java
@@ -0,0 +1,57 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.text;
+
+import jdk.internal.org.commonmark.node.Node;
+
+public interface TextContentNodeRendererContext {
+
+    /**
+     * @return true for stripping new lines and render text as "single line",
+     * false for keeping all line breaks.
+     */
+    boolean stripNewlines();
+
+    /**
+     * @return the writer to use
+     */
+    TextContentWriter getWriter();
+
+    /**
+     * Render the specified node and its children using the configured renderers. This should be used to render child
+     * nodes; be careful not to pass the node that is being rendered, that would result in an endless loop.
+     *
+     * @param node the node to render
+     */
+    void render(Node node);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentNodeRendererFactory.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentNodeRendererFactory.java
new file mode 100644
index 00000000000..5c110ba4d29
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentNodeRendererFactory.java
@@ -0,0 +1,49 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.text;
+
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+
+/**
+ * Factory for instantiating new node renderers when rendering is done.
+ */
+public interface TextContentNodeRendererFactory {
+
+    /**
+     * Create a new node renderer for the specified rendering context.
+     *
+     * @param context the context for rendering (normally passed on to the node renderer)
+     * @return a node renderer
+     */
+    NodeRenderer create(TextContentNodeRendererContext context);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentRenderer.java
new file mode 100644
index 00000000000..6ac282fd4c7
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentRenderer.java
@@ -0,0 +1,184 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.text;
+
+import jdk.internal.org.commonmark.Extension;
+import jdk.internal.org.commonmark.internal.renderer.NodeRendererMap;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+import jdk.internal.org.commonmark.renderer.Renderer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Renders nodes to plain text content with minimal markup-like additions.
+ */
+public class TextContentRenderer implements Renderer {
+
+    private final boolean stripNewlines;
+
+    private final List<TextContentNodeRendererFactory> nodeRendererFactories;
+
+    private TextContentRenderer(Builder builder) {
+        this.stripNewlines = builder.stripNewlines;
+
+        this.nodeRendererFactories = new ArrayList<>(builder.nodeRendererFactories.size() + 1);
+        this.nodeRendererFactories.addAll(builder.nodeRendererFactories);
+        // Add as last. This means clients can override the rendering of core nodes if they want.
+        this.nodeRendererFactories.add(new TextContentNodeRendererFactory() {
+            @Override
+            public NodeRenderer create(TextContentNodeRendererContext context) {
+                return new CoreTextContentNodeRenderer(context);
+            }
+        });
+    }
+
+    /**
+     * Create a new builder for configuring a {@link TextContentRenderer}.
+     *
+     * @return a builder
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    @Override
+    public void render(Node node, Appendable output) {
+        RendererContext context = new RendererContext(new TextContentWriter(output));
+        context.render(node);
+    }
+
+    @Override
+    public String render(Node node) {
+        StringBuilder sb = new StringBuilder();
+        render(node, sb);
+        return sb.toString();
+    }
+
+    /**
+     * Builder for configuring a {@link TextContentRenderer}. See methods for default configuration.
+     */
+    public static class Builder {
+
+        private boolean stripNewlines = false;
+        private List<TextContentNodeRendererFactory> nodeRendererFactories = new ArrayList<>();
+
+        /**
+         * @return the configured {@link TextContentRenderer}
+         */
+        public TextContentRenderer build() {
+            return new TextContentRenderer(this);
+        }
+
+        /**
+         * Set the value of flag for stripping new lines.
+         *
+         * @param stripNewlines true for stripping new lines and render text as "single line",
+         *                      false for keeping all line breaks
+         * @return {@code this}
+         */
+        public Builder stripNewlines(boolean stripNewlines) {
+            this.stripNewlines = stripNewlines;
+            return this;
+        }
+
+        /**
+         * Add a factory for instantiating a node renderer (done when rendering). This allows to override the rendering
+         * of node types or define rendering for custom node types.
+         * <p>
+         * If multiple node renderers for the same node type are created, the one from the factory that was added first
+         * "wins". (This is how the rendering for core node types can be overridden; the default rendering comes last.)
+         *
+         * @param nodeRendererFactory the factory for creating a node renderer
+         * @return {@code this}
+         */
+        public Builder nodeRendererFactory(TextContentNodeRendererFactory nodeRendererFactory) {
+            this.nodeRendererFactories.add(nodeRendererFactory);
+            return this;
+        }
+
+        /**
+         * @param extensions extensions to use on this text content renderer
+         * @return {@code this}
+         */
+        public Builder extensions(Iterable<? extends Extension> extensions) {
+            for (Extension extension : extensions) {
+                if (extension instanceof TextContentRenderer.TextContentRendererExtension) {
+                    TextContentRenderer.TextContentRendererExtension textContentRendererExtension =
+                            (TextContentRenderer.TextContentRendererExtension) extension;
+                    textContentRendererExtension.extend(this);
+                }
+            }
+            return this;
+        }
+    }
+
+    /**
+     * Extension for {@link TextContentRenderer}.
+     */
+    public interface TextContentRendererExtension extends Extension {
+        void extend(TextContentRenderer.Builder rendererBuilder);
+    }
+
+    private class RendererContext implements TextContentNodeRendererContext {
+        private final TextContentWriter textContentWriter;
+        private final NodeRendererMap nodeRendererMap = new NodeRendererMap();
+
+        private RendererContext(TextContentWriter textContentWriter) {
+            this.textContentWriter = textContentWriter;
+
+            // The first node renderer for a node type "wins".
+            for (int i = nodeRendererFactories.size() - 1; i >= 0; i--) {
+                TextContentNodeRendererFactory nodeRendererFactory = nodeRendererFactories.get(i);
+                NodeRenderer nodeRenderer = nodeRendererFactory.create(this);
+                nodeRendererMap.add(nodeRenderer);
+            }
+        }
+
+        @Override
+        public boolean stripNewlines() {
+            return stripNewlines;
+        }
+
+        @Override
+        public TextContentWriter getWriter() {
+            return textContentWriter;
+        }
+
+        @Override
+        public void render(Node node) {
+            nodeRendererMap.render(node);
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentWriter.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentWriter.java
new file mode 100644
index 00000000000..edbb7ae2839
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentWriter.java
@@ -0,0 +1,99 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.text;
+
+import java.io.IOException;
+
+public class TextContentWriter {
+
+    private final Appendable buffer;
+
+    private char lastChar;
+
+    public TextContentWriter(Appendable out) {
+        buffer = out;
+    }
+
+    public void whitespace() {
+        if (lastChar != 0 && lastChar != ' ') {
+            append(' ');
+        }
+    }
+
+    public void colon() {
+        if (lastChar != 0 && lastChar != ':') {
+            append(':');
+        }
+    }
+
+    public void line() {
+        if (lastChar != 0 && lastChar != '\n') {
+            append('\n');
+        }
+    }
+
+    public void writeStripped(String s) {
+        append(s.replaceAll("[\\r\\n\\s]+", " "));
+    }
+
+    public void write(String s) {
+        append(s);
+    }
+
+    public void write(char c) {
+        append(c);
+    }
+
+    private void append(String s) {
+        try {
+            buffer.append(s);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        int length = s.length();
+        if (length != 0) {
+            lastChar = s.charAt(length - 1);
+        }
+    }
+
+    private void append(char c) {
+        try {
+            buffer.append(c);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        lastChar = c;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/package-info.java
new file mode 100644
index 00000000000..c84c2c33755
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * Plain text rendering with minimal markup (see {@link org.commonmark.renderer.text.TextContentRenderer})
+ */
+package jdk.internal.org.commonmark.renderer.text;
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/AsciiMatcher.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/AsciiMatcher.java
new file mode 100644
index 00000000000..76b90c9b6fd
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/AsciiMatcher.java
@@ -0,0 +1,105 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.text;
+
+import java.util.BitSet;
+import java.util.Set;
+
+/**
+ * Char matcher that can match ASCII characters efficiently.
+ */
+public class AsciiMatcher implements CharMatcher {
+    private final BitSet set;
+
+    private AsciiMatcher(Builder builder) {
+        this.set = builder.set;
+    }
+
+    @Override
+    public boolean matches(char c) {
+        return set.get(c);
+    }
+
+    public Builder newBuilder() {
+        return new Builder((BitSet) set.clone());
+    }
+
+    public static Builder builder() {
+        return new Builder(new BitSet());
+    }
+
+    public static Builder builder(AsciiMatcher matcher) {
+        return new Builder((BitSet) matcher.set.clone());
+    }
+
+    public static class Builder {
+        private final BitSet set;
+
+        private Builder(BitSet set) {
+            this.set = set;
+        }
+
+        public Builder c(char c) {
+            if (c > 127) {
+                throw new IllegalArgumentException("Can only match ASCII characters");
+            }
+            set.set(c);
+            return this;
+        }
+
+        public Builder anyOf(String s) {
+            for (int i = 0; i < s.length(); i++) {
+                c(s.charAt(i));
+            }
+            return this;
+        }
+
+        public Builder anyOf(Set<Character> characters) {
+            for (Character c : characters) {
+                c(c);
+            }
+            return this;
+        }
+
+        public Builder range(char from, char toInclusive) {
+            for (char c = from; c <= toInclusive; c++) {
+                c(c);
+            }
+            return this;
+        }
+
+        public AsciiMatcher build() {
+            return new AsciiMatcher(this);
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/CharMatcher.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/CharMatcher.java
new file mode 100644
index 00000000000..b4ac2ed1c67
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/CharMatcher.java
@@ -0,0 +1,45 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.text;
+
+/**
+ * Matcher interface for {@code char} values.
+ * <p>
+ * Note that because this matches on {@code char} values only (as opposed to {@code int} code points),
+ * this only operates on the level of code units and doesn't support supplementary characters
+ * (see {@link Character#isSupplementaryCodePoint(int)}).
+ */
+public interface CharMatcher {
+
+    boolean matches(char c);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/Characters.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/Characters.java
new file mode 100644
index 00000000000..d69e1251874
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/Characters.java
@@ -0,0 +1,189 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.text;
+
+/**
+ * Functions for finding characters in strings or checking characters.
+ */
+public class Characters {
+
+    public static int find(char c, CharSequence s, int startIndex) {
+        int length = s.length();
+        for (int i = startIndex; i < length; i++) {
+            if (s.charAt(i) == c) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public static int findLineBreak(CharSequence s, int startIndex) {
+        int length = s.length();
+        for (int i = startIndex; i < length; i++) {
+            switch (s.charAt(i)) {
+                case '\n':
+                case '\r':
+                    return i;
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * @see <a href="https://spec.commonmark.org/0.31.2/#blank-line">blank line</a>
+     */
+    public static boolean isBlank(CharSequence s) {
+        return skipSpaceTab(s, 0, s.length()) == s.length();
+    }
+
+    public static boolean hasNonSpace(CharSequence s) {
+        int length = s.length();
+        int skipped = skip(' ', s, 0, length);
+        return skipped != length;
+    }
+
+    public static boolean isLetter(CharSequence s, int index) {
+        int codePoint = Character.codePointAt(s, index);
+        return Character.isLetter(codePoint);
+    }
+
+    public static boolean isSpaceOrTab(CharSequence s, int index) {
+        if (index < s.length()) {
+            switch (s.charAt(index)) {
+                case ' ':
+                case '\t':
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @see <a href="https://spec.commonmark.org/0.31.2/#unicode-punctuation-character">Unicode punctuation character</a>
+     */
+    public static boolean isPunctuationCodePoint(int codePoint) {
+        switch (Character.getType(codePoint)) {
+            // General category "P" (punctuation)
+            case Character.DASH_PUNCTUATION:
+            case Character.START_PUNCTUATION:
+            case Character.END_PUNCTUATION:
+            case Character.CONNECTOR_PUNCTUATION:
+            case Character.OTHER_PUNCTUATION:
+            case Character.INITIAL_QUOTE_PUNCTUATION:
+            case Character.FINAL_QUOTE_PUNCTUATION:
+                // General category "S" (symbol)
+            case Character.MATH_SYMBOL:
+            case Character.CURRENCY_SYMBOL:
+            case Character.MODIFIER_SYMBOL:
+            case Character.OTHER_SYMBOL:
+                return true;
+            default:
+                switch (codePoint) {
+                    case '$':
+                    case '+':
+                    case '<':
+                    case '=':
+                    case '>':
+                    case '^':
+                    case '`':
+                    case '|':
+                    case '~':
+                        return true;
+                    default:
+                        return false;
+                }
+        }
+    }
+
+    /**
+     * Check whether the provided code point is a Unicode whitespace character as defined in the spec.
+     *
+     * @see <a href="https://spec.commonmark.org/0.31.2/#unicode-whitespace-character">Unicode whitespace character</a>
+     */
+    public static boolean isWhitespaceCodePoint(int codePoint) {
+        switch (codePoint) {
+            case ' ':
+            case '\t':
+            case '\n':
+            case '\f':
+            case '\r':
+                return true;
+            default:
+                return Character.getType(codePoint) == Character.SPACE_SEPARATOR;
+        }
+    }
+
+    public static int skip(char skip, CharSequence s, int startIndex, int endIndex) {
+        for (int i = startIndex; i < endIndex; i++) {
+            if (s.charAt(i) != skip) {
+                return i;
+            }
+        }
+        return endIndex;
+    }
+
+    public static int skipBackwards(char skip, CharSequence s, int startIndex, int lastIndex) {
+        for (int i = startIndex; i >= lastIndex; i--) {
+            if (s.charAt(i) != skip) {
+                return i;
+            }
+        }
+        return lastIndex - 1;
+    }
+
+    public static int skipSpaceTab(CharSequence s, int startIndex, int endIndex) {
+        for (int i = startIndex; i < endIndex; i++) {
+            switch (s.charAt(i)) {
+                case ' ':
+                case '\t':
+                    break;
+                default:
+                    return i;
+            }
+        }
+        return endIndex;
+    }
+
+    public static int skipSpaceTabBackwards(CharSequence s, int startIndex, int lastIndex) {
+        for (int i = startIndex; i >= lastIndex; i--) {
+            switch (s.charAt(i)) {
+                case ' ':
+                case '\t':
+                    break;
+                default:
+                    return i;
+            }
+        }
+        return lastIndex - 1;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/package-info.java
new file mode 100644
index 00000000000..14c6328b517
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * Text processing utilities for parsing and rendering, exported for use by extensions
+ */
+package jdk.internal.org.commonmark.text;
diff --git a/src/jdk.internal.md/share/classes/module-info.java b/src/jdk.internal.md/share/classes/module-info.java
new file mode 100644
index 00000000000..a9e3e5e2a03
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/module-info.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// This module is primarily an import from a recent tagged version of
+//     https://github.com/commonmark/commonmark-java
+//
+// The following parts are imported:
+//
+// * commonmark/src/main/java
+// * commonmark/src/main/resources
+// * commonmark-ext-gfm-tables/src/main/java
+// * commonmark-ext-gfm-tables/src/main/resources
+//
+// For source and resource files, the following transformations are applied:
+//
+// * legal headers are added
+// * package and import statements are updated
+// * characters outside the ASCII range are converted to Unicode escapes
+// * @SuppressWarnings("fallthrough") is added to getSetextHeadingLevel
+// * the value for ENTITY_PATH is updated with the modified package
+// * the file `entities.properties` is renamed to `entities.txt`
+
+/**
+ * Internal support for Markdown.
+ *
+ * @since 23
+ */
+module jdk.internal.md {
+    requires jdk.compiler;
+
+    exports jdk.internal.markdown to
+            jdk.javadoc,
+            jdk.jshell;
+    exports jdk.internal.org.commonmark to
+            jdk.javadoc,
+            jdk.jshell;
+    exports jdk.internal.org.commonmark.ext.gfm.tables to
+            jdk.javadoc,
+            jdk.jshell;
+    exports jdk.internal.org.commonmark.node to
+            jdk.javadoc,
+            jdk.jshell;
+    exports jdk.internal.org.commonmark.parser to
+            jdk.javadoc,
+            jdk.jshell;
+    exports jdk.internal.org.commonmark.renderer to
+            jdk.javadoc,
+            jdk.jshell;
+    exports jdk.internal.org.commonmark.renderer.html to
+            jdk.javadoc,
+            jdk.jshell;
+
+    provides com.sun.tools.javac.api.JavacTrees.DocCommentTreeTransformer
+            with jdk.internal.markdown.MarkdownTransformer;
+}
diff --git a/src/jdk.internal.md/share/legal/commonmark.md b/src/jdk.internal.md/share/legal/commonmark.md
new file mode 100644
index 00000000000..1fd2d7eb01b
--- /dev/null
+++ b/src/jdk.internal.md/share/legal/commonmark.md
@@ -0,0 +1,29 @@
+## CommonMark 0.22.0
+
+### CommonMark License
+```
+Copyright (c) 2015, Atlassian Pty Ltd
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+```
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Content.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Content.java
index 597747bdb4c..13a2bb4c1bf 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Content.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Content.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -141,4 +141,15 @@ public boolean isDiscardable() {
     public int charCount() {
         return 0;
     }
+
+    /**
+     * {@return true if the content is "phrasing content"}
+     *
+     * Phrasing content is content that may appear in a paragraph, such as text, or certain HTML elements.
+     *
+     * @see <a href="https://html.spec.whatwg.org/multipage/dom.html#phrasing-content">Phrasing content</a>
+     */
+    public boolean isPhrasingContent() {
+        return false;
+    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java
index 47b2b6b41fe..71e576b4408 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java
@@ -158,8 +158,9 @@ private void copyDirectory(DocFile srcdir, final DocPath dstDocPath,
                     configuration.messages.warning("doclet.Copy_Overwrite_warning",
                             srcfile.getPath(), dstdir.getPath());
                 } else {
-                    if (Utils.toLowerCase(srcfile.getPath()).endsWith(".html")) {
-                        handleHtmlFile(srcfile, dstDocPath);
+                    var path = Utils.toLowerCase(srcfile.getPath());
+                    if (path.endsWith(".html") || path.endsWith(".md")) {
+                        handleDocFile(srcfile, dstDocPath);
                     } else {
                         configuration.messages.notice("doclet.Copying_File_0_To_Dir_1",
                                 srcfile.getPath(), dstdir.getPath());
@@ -186,10 +187,10 @@ private boolean isValidFilename(DocFile f) {
         }
     }
 
-    private void handleHtmlFile(DocFile srcFile, DocPath dstPath) throws DocletException {
+    private void handleDocFile(DocFile srcFile, DocPath dstPath) throws DocletException {
         var fileObject = srcFile.getFileObject();
         var dfElement = new DocFileElement(utils, element, fileObject);
-        var path = dstPath.resolve(srcFile.getName());
+        var path = dstPath.resolve(srcFile.getName().replaceAll("\\.[a-z]+$", ".html"));
 
         writerFactory.newDocFileWriter(path, dfElement).buildPage();
     }
@@ -246,8 +247,8 @@ public void buildPage() throws DocFileIOException {
             printHtmlDocument(List.of(), null, localTagsContent, List.of(), htmlContent);
         }
 
-        private String getWindowTitle(HtmlDocletWriter docletWriter, Element element) {
-            String t = configuration.utils.getHTMLTitle(element);
+        private String getWindowTitle(HtmlDocletWriter docletWriter, DocFileElement element) {
+            var t = docletWriter.getFileTitle(element);
             return docletWriter.getWindowTitle(t);
         }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java
index a57bc9544b6..cd66876997c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.markup.Text;
-import jdk.javadoc.internal.doclets.toolkit.DocletElement;
+import jdk.javadoc.internal.doclets.toolkit.DocFileElement;
 import jdk.javadoc.internal.doclets.toolkit.OverviewElement;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
@@ -70,7 +70,7 @@ public class ExternalSpecsWriter extends HtmlDocletWriter {
     /**
      * Cached contents of {@code <title>...</title>} tags of the HTML pages.
      */
-    final Map<Element, String> titles = new WeakHashMap<>();
+    final Map<DocFileElement, String> titles = new WeakHashMap<>();
 
     /**
      * Constructs ExternalSpecsWriter object.
@@ -274,29 +274,27 @@ private static int find(String s, int start, Predicate<Character> p) {
 
     private Content createLink(IndexItem i) {
         assert i.getDocTree().getKind() == DocTree.Kind.SPEC : i;
-        Element element = i.getElement();
+        var element = i.getElement();
         if (element instanceof OverviewElement) {
             return links.createLink(pathToRoot.resolve(i.getUrl()),
                     resources.getText("doclet.Overview"));
-        } else if (element instanceof DocletElement e) {
-            // Implementations of DocletElement do not override equals and
-            // hashCode; putting instances of DocletElement in a map is not
-            // incorrect, but might well be inefficient
-            String t = titles.computeIfAbsent(element, utils::getHTMLTitle);
+        } else if (element instanceof DocFileElement e) {
+            var fo = e.getFileObject();
+            var t = titles.computeIfAbsent(e, this::getFileTitle);
             if (t.isBlank()) {
                 // The user should probably be notified (a warning?) that this
                 // file does not have a title
-                Path p = Path.of(e.getFileObject().toUri());
+                Path p = Path.of(fo.toUri());
                 t = p.getFileName().toString();
             }
-            ContentBuilder b = new ContentBuilder();
-            b.add(HtmlTree.CODE(Text.of(i.getHolder() + ": ")));
-            // non-program elements should be displayed using a normal font
-            b.add(t);
+            var b = new ContentBuilder()
+                    .add(HtmlTree.CODE(Text.of(i.getHolder() + ": ")))
+                    // non-program elements should be displayed using a normal font
+                    .add(t);
             return links.createLink(pathToRoot.resolve(i.getUrl()), b);
         } else {
             // program elements should be displayed using a code font
-            Content link = links.createLink(pathToRoot.resolve(i.getUrl()), i.getHolder());
+            var link = links.createLink(pathToRoot.resolve(i.getUrl()), i.getHolder());
             return HtmlTree.CODE(link);
         }
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
index d3d46c3c3b8..649687e19a2 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
@@ -25,8 +25,11 @@
 
 package jdk.javadoc.internal.doclets.formats.html;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.time.ZonedDateTime;
@@ -41,6 +44,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.Function;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.PackageElement;
@@ -64,6 +68,7 @@
 import jdk.javadoc.internal.doclets.toolkit.Resources;
 import jdk.javadoc.internal.doclets.toolkit.util.DeprecatedAPIListBuilder;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
+import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.NewAPIBuilder;
@@ -198,6 +203,18 @@ public enum ConditionalPage {
      */
     private final Set<PackageElement> containingPackagesSeen;
 
+    /**
+     * List of additional JavaScript files
+     */
+    private List<JavaScriptFile> additionalScripts;
+
+    /**
+     * Record for JavaScript file and module flag.
+     * @param path file path
+     * @param isModule module flag
+     */
+    public record JavaScriptFile(DocPath path, boolean isModule) {}
+
     /**
      * Constructs the full configuration needed by the doclet, including
      * the format-specific part, defined in this class, and the format-independent
@@ -316,6 +333,9 @@ public boolean finishOptionSettings() {
                 }
             }
         }
+        additionalScripts = options.additionalScripts().stream()
+                .map(this::detectJSModule)
+                .collect(Collectors.toList());
         if (options.createIndex()) {
             indexBuilder = new HtmlIndexBuilder(this);
         }
@@ -326,6 +346,26 @@ public boolean finishOptionSettings() {
         return true;
     }
 
+    private JavaScriptFile detectJSModule(String fileName) {
+        DocFile file = DocFile.createFileForInput(this, fileName);
+        boolean isModule = fileName.toLowerCase(Locale.ROOT).endsWith(".mjs");
+        if (!isModule) {
+            // Regex to detect JavaScript modules
+            Pattern modulePattern = Pattern.compile("""
+                    (?:^|[;}])\\s*(?:\
+                    import\\s*["']|\
+                    import[\\s{*][^()]*from\\s*["']|\
+                    export(?:\\s+(?:let|const|function|class|var|default|async)|\\s*[{*]))""");
+            try (InputStream in = file.openInputStream();
+                 BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
+                isModule = reader.lines().anyMatch(s -> modulePattern.matcher(s).find());
+            } catch (DocFileIOException | IOException e) {
+                // Errors are handled when copying resources
+            }
+        }
+        return new JavaScriptFile(DocPath.create(file.getName()), isModule);
+    }
+
     /**
      * {@return the date to be recorded in generated files}
      */
@@ -421,11 +461,8 @@ public List<DocPath> getAdditionalStylesheets() {
                 .collect(Collectors.toCollection(ArrayList::new));
     }
 
-    public List<DocPath> getAdditionalScripts() {
-        return options.additionalScripts().stream()
-                .map(sf -> DocFile.createFileForInput(this, sf))
-                .map(file -> DocPath.create(file.getName()))
-                .collect(Collectors.toCollection(ArrayList::new));
+    public List<JavaScriptFile> getAdditionalScripts() {
+        return additionalScripts;
     }
 
     @Override
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
index 3e461dc3e74..7cc4a409759 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
@@ -45,6 +45,7 @@
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.ModuleElement;
 import javax.lang.model.element.Name;
@@ -75,11 +76,25 @@
 import com.sun.source.doctree.InlineTagTree;
 import com.sun.source.doctree.LinkTree;
 import com.sun.source.doctree.LiteralTree;
+import com.sun.source.doctree.RawTextTree;
 import com.sun.source.doctree.StartElementTree;
 import com.sun.source.doctree.TextTree;
 import com.sun.source.util.DocTreePath;
 import com.sun.source.util.SimpleDocTreeVisitor;
 
+import jdk.internal.org.commonmark.Extension;
+import jdk.internal.org.commonmark.ext.gfm.tables.TablesExtension;
+import jdk.internal.org.commonmark.node.AbstractVisitor;
+import jdk.internal.org.commonmark.node.Code;
+import jdk.internal.org.commonmark.node.Heading;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.parser.Parser;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+import jdk.internal.org.commonmark.renderer.html.HtmlNodeRendererContext;
+import jdk.internal.org.commonmark.renderer.html.HtmlNodeRendererFactory;
+import jdk.internal.org.commonmark.renderer.html.HtmlRenderer;
+import jdk.internal.org.commonmark.renderer.html.HtmlWriter;
+
 import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
 import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
 import jdk.javadoc.internal.doclets.formats.html.markup.Head;
@@ -95,6 +110,7 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.TextBuilder;
 import jdk.javadoc.internal.doclets.formats.html.taglets.Taglet;
 import jdk.javadoc.internal.doclets.formats.html.taglets.TagletWriter;
+import jdk.javadoc.internal.doclets.toolkit.DocFileElement;
 import jdk.javadoc.internal.doclets.toolkit.DocletException;
 import jdk.javadoc.internal.doclets.toolkit.Messages;
 import jdk.javadoc.internal.doclets.toolkit.Resources;
@@ -205,7 +221,7 @@ public HtmlDocletWriter(HtmlConfiguration configuration, DocPath path) {
      *
      * @param configuration the configuration for this doclet
      * @param path the file to be generated.
-     * @param generating whether to write a "Geneterating ..." message to the console
+     * @param generating whether to write a "Generating ..." message to the console
      */
     protected HtmlDocletWriter(HtmlConfiguration configuration, DocPath path, boolean generating) {
         this.configuration = configuration;
@@ -503,7 +519,10 @@ public void printHtmlDocument(List<String> metakeywords,
     }
 
     /**
-     * Get the window title.
+     * Returns the window title.
+     *
+     * The window title is the composition of the given title and
+     * any value set by the window-title option.
      *
      * @param title the title string to construct the complete window title
      * @return the window title string
@@ -515,6 +534,105 @@ public String getWindowTitle(String title) {
         return title;
     }
 
+    /**
+     * {@return the title for a doc-file element}
+     *
+     * For an HTML file, the title is as given in the {@code <title>} element,
+     * as found in the preamble of the doc-comment tree.
+     *
+     * For a Markdown file, there is no direct representation of the page title,
+     * and so the content of the {@code <h1>} heading is used.
+     *
+     * @param element the doc-file element
+     */
+    public String getFileTitle(DocFileElement element) {
+        var fileName = element.getFileObject().getName();
+        if (fileName.endsWith(".html")) {
+            return getTextContent(utils.getPreamble(element), "title");
+        } else if (fileName.endsWith(".md")) {
+            var c = commentTagsToContent(element, utils.getBody(element), false);
+            return getHeadingText(c);
+        } else {
+            throw new IllegalArgumentException(fileName);
+        }
+    }
+
+    /**
+     * {@return the plain-text content of a named HTML element in a list of content}
+     *
+     * @param trees the list of content
+     * @param name the name og the HTML element
+     */
+    private String getTextContent(List<? extends DocTree> trees, String name) {
+        var sb = new StringBuilder();
+        var collectText = false;
+        loop:
+        for (DocTree dt : trees) {
+            switch (dt.getKind()) {
+                case START_ELEMENT -> {
+                    var nodeStart = (StartElementTree) dt;
+                    if (nodeStart.getName().toString().equalsIgnoreCase(name)) {
+                        collectText = true;
+                    }
+                }
+                case END_ELEMENT -> {
+                    var nodeEnd = (EndElementTree) dt;
+                    if (nodeEnd.getName().toString().equalsIgnoreCase(name)) {
+                        break loop;
+                    }
+                }
+                case TEXT -> {
+                    var nodeText = (TextTree) dt;
+                    if (collectText)
+                        sb.append(nodeText.getBody());
+                }
+                default -> {
+                }
+                // do nothing
+            }
+        }
+        return sb.toString().trim();
+    }
+
+    /**
+     * {@return the content of the {@code <h1>} heading in the given content,
+     * or an empty string if there is no such heading}
+     *
+     * The heading must be at the beginning of the content.
+     * It may be represented in either an HTML tree with tag name {@code h1}
+     * or in a raw HTML node.
+     *
+     * @param c the content
+     */
+    private String getHeadingText(Content c) {
+        var sb = new StringBuilder();
+        if (c instanceof ContentBuilder cb) {
+            var contents = cb.getContents();
+            if (!contents.isEmpty()) {
+                var first = contents.get(0);
+                if (first instanceof HtmlTree htmlTree && htmlTree.tagName.equals(TagName.H1)) {
+                    for (var c2 : htmlTree.getContents()) {
+                        if (c2 instanceof Text t) {
+                            sb.append(t.toString());
+                        } else if (c2 instanceof TextBuilder tb) {
+                            sb.append(tb.toString());
+                        }
+                    }
+                    return sb.toString();
+                } else if (first instanceof RawHtml rawHtml) {
+                    Pattern h1 = Pattern.compile("<h1[^>]*>(.*)</h1>");
+                    Matcher m = h1.matcher(rawHtml.toString());
+                    if (m.lookingAt()) {
+                        var heading = m.group(1);
+                        var headingText = heading.replaceAll("</?[^>]+>", "");
+                        return headingText;
+                    }
+                }
+            }
+        }
+        return "";
+    }
+
     /**
      * Returns a {@code <header>} element, containing the user "top" text, if any,
      * and the main navigation bar.
@@ -1267,10 +1385,13 @@ public ContentBuilder add(CharSequence text) {
         commentRemoved = false;
         List<Name> openTags = new ArrayList<>();
 
-        for (ListIterator<? extends DocTree> iterator = trees.listIterator(); iterator.hasNext();) {
+        var useMarkdown = trees.stream().anyMatch(t -> t.getKind() == Kind.MARKDOWN);
+        var markdownHandler = useMarkdown ? new MarkdownHandler(element) : null;
+
+        for (ListIterator<? extends DocTree> iterator = trees.listIterator(); iterator.hasNext(); ) {
             boolean isFirstNode = !iterator.hasPrevious();
             DocTree tag = iterator.next();
-            boolean isLastNode  = !iterator.hasNext();
+            boolean isLastNode = !iterator.hasNext();
 
             if (context.isFirstSentence) {
                 // Ignore block tags
@@ -1293,13 +1414,19 @@ public ContentBuilder add(CharSequence text) {
             }
 
             var docTreeVisitor = new InlineVisitor(element, tag, isLastNode, context, ch, trees);
-
-            boolean allDone = docTreeVisitor.visit(tag, result);
+            boolean allDone = useMarkdown
+                    ? markdownHandler.handle(tag, docTreeVisitor)
+                    : docTreeVisitor.visit(tag, result);
             commentRemoved = false;
 
             if (allDone)
                 break;
         }
+
+        if (useMarkdown) {
+            markdownHandler.addContent(result);
+        }
+
         // Close any open inline tags
         while (!openTags.isEmpty()) {
             result.add(RawHtml.endElement(openTags.removeLast()));
@@ -1307,6 +1434,219 @@ public ContentBuilder add(CharSequence text) {
         return result;
     }
 
+    private class MarkdownHandler {
+        /**
+         * Placeholder for non-HTML nodes that are phrasing content.
+         * The character (\uFFFC) is the Unicode Object Replacement Character, {@code U+FFFC}.
+         */
+        private static final char PLACEHOLDER_CHAR = '\uFFFC';
+        /**
+         * Placeholder for non-HTML nodes that are not phrasing content.
+         * The placeholder is an HTML block, according to CommonMark 4.6 rule 2,
+         * and so will not be wrapped into with {@code <p>...</p>} tags.
+         * @see <a href="https://spec.commonmark.org/0.30/#html-blocks">HTML blocks</a>
+         */
+        private static final String PLACEHOLDER_BLOCK = "<!--\uFFFC-->";
+        private static final Pattern PLACEHOLDERS = Pattern.compile(PLACEHOLDER_CHAR + "|" + PLACEHOLDER_BLOCK);
+
+        private final StringBuilder markdownInput = new StringBuilder() ;
+        private final ArrayList<Content> fffcObjects = new ArrayList<>();
+
+        private final Extension tablesExtn = TablesExtension.create();
+        private final HtmlNodeRendererFactory headingRendererFactory = HeadingNodeRenderer::new;
+
+        private final Element element;
+
+        private final Parser parser = Parser.builder()
+                .extensions(List.of(tablesExtn))
+                .build();
+        private final HtmlRenderer renderer = HtmlRenderer.builder()
+                .nodeRendererFactory(headingRendererFactory)
+                .extensions(List.of(tablesExtn))
+                .build();
+
+        MarkdownHandler(Element element) {
+            this.element = element;
+        }
+
+        boolean handle(DocTree tree, InlineVisitor visitor) {
+            boolean allDone;
+            if (tree instanceof RawTextTree t) {
+                if (t.getKind() != Kind.MARKDOWN) {
+                    throw new IllegalStateException(t.getKind().toString());
+                }
+                String code = t.getContent();
+                // handle the (unlikely) case of FFFC characters existing in the code
+                int start = 0;
+                int pos;
+                while ((pos = code.indexOf(PLACEHOLDER_CHAR, start)) != -1) {
+                    markdownInput.append(code.substring(start, pos));
+                    markdownInput.append(PLACEHOLDER_CHAR);
+                    fffcObjects.add(Text.of(String.valueOf(PLACEHOLDER_CHAR)));
+                    start = pos + 1;
+                }
+                markdownInput.append(code.substring(start));
+                allDone = false;
+            } else {
+                Content embeddedContent = new ContentBuilder();
+                allDone = visitor.visit(tree, embeddedContent);
+                fffcObjects.add(embeddedContent);
+                if (embeddedContent.isPhrasingContent()) {
+                    markdownInput.append(PLACEHOLDER_CHAR);
+                } else {
+                    if (!markdownInput.isEmpty() && markdownInput.charAt(markdownInput.length() - 1) != '\n') {
+                        markdownInput.append('\n');
+                    }
+                    markdownInput.append(PLACEHOLDER_BLOCK);
+                }
+            }
+            return allDone;
+        }
+
+        void addContent(Content result) {
+            Node document = parser.parse(markdownInput.toString());
+            String markdownOutput = unwrap(renderer.render(document));
+            Matcher m = PLACEHOLDERS.matcher(markdownOutput);
+            int start = 0;
+            int pos;
+            int fffcObjectIndex = 0;
+            while (m.find()) {
+                result.add(RawHtml.markdown(markdownOutput.substring(start, m.start())));
+                result.add(fffcObjects.get(fffcObjectIndex++));
+                start = m.end();
+            }
+            if (start < markdownOutput.length()) {
+                result.add(RawHtml.of(markdownOutput.substring(start)));
+            }
+        }
+
+        /*
+         * If a string contains a simple HTML paragraph, beginning with <p>
+         * and ending with </p> and optional whitespace, return the content
+         * of the paragraph between the tags.
+         * Otherwise, return the string unmodified.
+         */
+        private static String unwrap(String s) {
+            var prefix = "<p>";
+            if (s.startsWith(prefix)) {
+                var suffix = "</p>";
+                var suffixPos = s.indexOf(suffix);
+                if (suffixPos > 0) {
+                    var endSuffixPos = suffixPos + suffix.length();
+                    if (isBlank(s, endSuffixPos, s.length())) {
+                        return s.substring(prefix.length(), suffixPos);
+                    }
+                }
+            }
+            return s;
+        }
+
+        /**
+         * A renderer for Markdown {@code Heading} nodes, which represent
+         * both ATX headings (using {@code ####}) and Setext (using underlines).
+         * The mapping to HTML takes into account the context within the overall
+         * generated page, and automatically includes an id, to allow the heading
+         * to be referenced from elsewhere.
+         */
+        private class HeadingNodeRenderer extends AbstractVisitor implements NodeRenderer {
+            private final HtmlWriter htmlWriter;
+            private final HtmlNodeRendererContext context;
+
+            HeadingNodeRenderer(HtmlNodeRendererContext context) {
+                this.htmlWriter = context.getWriter();
+                this.context = context;
+            }
+
+            @Override
+            public Set<Class<? extends Node>> getNodeTypes() {
+                return Set.of(Heading.class);
+            }
+
+            @Override
+            public void render(Node node) {
+                node.accept(this);
+            }
+
+            @Override
+            public void visit(Heading heading) {
+                var htag = getTag(heading);
+                var id = getId(heading);
+
+                htmlWriter.line();
+                htmlWriter.tag(htag, Map.of("id", id.name()));
+                visitChildren(heading);
+                htmlWriter.tag('/' + htag);
+                htmlWriter.line();
+
+                if (includeHeadingInTableOfContents(htag)) {
+                    StringBuilder headingContent = new StringBuilder();
+                    new AbstractVisitor() {
+                        @Override
+                        public void visit(jdk.internal.org.commonmark.node.Code code) {
+                            headingContent.append(code.getLiteral());
+                            super.visit(code);
+                        }
+
+                        @Override
+                        public void visit(jdk.internal.org.commonmark.node.Text text) {
+                            headingContent.append(text.getLiteral());
+                            super.visit(text);
+                        }
+                    }.visit(heading);
+                    tableOfContents.addLink(id, Text.of(headingContent));
+                }
+            }
+
+            @Override
+            protected void visitChildren(Node parent) {
+                Node node = parent.getFirstChild();
+                while (node != null) {
+                    Node next = node.getNext();
+                    context.render(node);
+                    node = next;
+                }
+            }
+
+            private String getTag(Heading heading) {
+                // offset the heading level to allow for its position in the overall page
+                var eKind = element.getKind();
+                var offset = eKind.isField() || eKind.isExecutable() ? 3 // members
+                        : eKind != ElementKind.OTHER ? 1   // module, package, class, interface
+                        : 0; // doc file
+                return "h" + Math.min(heading.getLevel() + offset, 6);
+            }
+
+            private HtmlId getId(Heading heading) {
+                var list = new ArrayList<String>();
+                heading.accept(new AbstractVisitor() {
+                    @Override
+                    public void visit(jdk.internal.org.commonmark.node.Text text) {
+                        list.add(text.getLiteral());
+                    }
+
+                    @Override
+                    public void visit(Code code) {
+                        list.add(code.getLiteral());
+                    }
+                });
+                return htmlIds.forHeading(String.join(" ", list), headingIds);
+            }
+        }
+    }
+
+    /*
+     * Returns whether a substring of a string is blank.
+     * Avoid creating a substring or using regular expressions.
+     */
+    private static boolean isBlank(String s, int start, int end) {
+        for (int i = start; i < end; i++) {
+            if (!Character.isWhitespace(s.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     private class InlineVisitor extends SimpleDocTreeVisitor<Boolean, Content> {
         private final Element element;
         private final DocTree tag;
@@ -1406,6 +1746,12 @@ public Boolean visitComment(CommentTree node, Content content) {
             return false;
         }
 
+        @Override
+        public Boolean visitDocRoot(DocRootTree node, Content content) {
+            content.add(getInlineTagOutput(element, node, context));
+            return false;
+        }
+
         @Override
         public Boolean visitEndElement(EndElementTree node, Content content) {
             content.add(RawHtml.endElement(node.getName()));
@@ -1527,6 +1873,8 @@ private void createSectionIdAndIndex(StartElementTree node, List<? extends DocTr
         for (DocTree docTree : trees.subList(trees.indexOf(node) + 1, trees.size())) {
             if (docTree instanceof TextTree text) {
                 sb.append(text.getBody());
+            } else if (docTree instanceof RawTextTree raw) {
+                sb.append(raw.getContent().replaceAll("[^A-Za-z0-9]+", " "));
             } else if (docTree instanceof LiteralTree literal) {
                 sb.append(literal.getBody().getBody());
             } else if (docTree instanceof IndexTree index) {
@@ -1568,12 +1916,18 @@ && equalsIgnoreCase(endElement.getName(), tagName)) {
                     new DocLink(path, id));
             configuration.indexBuilder.add(item);
         }
-        // Record second-level headings for use in table of contents
-        if (tableOfContents != null && node.getName().toString().equalsIgnoreCase("h2")) {
+        if (includeHeadingInTableOfContents(node.getName())) {
             tableOfContents.addLink(HtmlId.of(id), Text.of(headingContent));
         }
     }
 
+    private boolean includeHeadingInTableOfContents(CharSequence tag) {
+        // Record second-level headings for use in table of contents
+        // TODO: maybe extend this to all headings up to a given level
+        return tableOfContents != null
+                && tag.toString().equalsIgnoreCase("h2");
+    }
+
     /**
      * Returns true if relative links should be redirected.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NewAPIListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NewAPIListWriter.java
index a976ad21548..f46765933cf 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NewAPIListWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NewAPIListWriter.java
@@ -29,7 +29,7 @@
 
 import javax.lang.model.element.Element;
 
-import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.SinceTree;
 
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
@@ -107,7 +107,7 @@ protected void addTableTabs(Table<Element> table, String headingKey) {
                                 ? getTableCaption(headingKey)
                                 : Text.of(release),
                         element -> {
-                            List<? extends DocTree> since = getSinceTree(element);
+                            List<? extends SinceTree> since = utils.getBlockTags(element, SINCE, SinceTree.class);
                             if (since.isEmpty()) {
                                 return false;
                             }
@@ -130,10 +130,10 @@ protected Content getTableCaption(String headingKey) {
 
     @Override
     protected Content getExtraContent(Element element) {
-        List<? extends DocTree> sinceTree = getSinceTree(element);
-        if (!sinceTree.isEmpty()) {
-            CommentHelper ch = utils.getCommentHelper(element);
-            return Text.of(ch.getBody(sinceTree.get(0)).toString());
+        var sinceTrees = utils.getBlockTags(element, SINCE, SinceTree.class);
+        if (!sinceTrees.isEmpty()) {
+            // assumes a simple string value with no formatting
+            return Text.of(sinceTrees.getFirst().getBody().getFirst().toString());
         }
         return Text.EMPTY;
     }
@@ -152,10 +152,6 @@ protected HtmlStyle[] getColumnStyles() {
         return new HtmlStyle[]{ HtmlStyle.colSummaryItemName, HtmlStyle.colSecond, HtmlStyle.colLast };
     }
 
-    private List<? extends DocTree> getSinceTree(Element element) {
-        return utils.hasDocCommentTree(element) ? utils.getBlockTags(element, SINCE) : List.of();
-    }
-
     private static String getHeading(HtmlConfiguration configuration) {
         String label = configuration.getOptions().sinceLabel();
         return label == null ? configuration.docResources.getText("doclet.New_API") : label;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java
index 0b4e9580efb..45985532ad6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,8 +34,6 @@
 import java.util.WeakHashMap;
 import java.util.stream.Collectors;
 
-import javax.lang.model.element.Element;
-
 import com.sun.source.doctree.DocTree;
 
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
@@ -44,7 +42,7 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.markup.Text;
-import jdk.javadoc.internal.doclets.toolkit.DocletElement;
+import jdk.javadoc.internal.doclets.toolkit.DocFileElement;
 import jdk.javadoc.internal.doclets.toolkit.OverviewElement;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
@@ -60,7 +58,7 @@ public class SystemPropertiesWriter extends HtmlDocletWriter {
     /**
      * Cached contents of {@code <title>...</title>} tags of the HTML pages.
      */
-    final Map<Element, String> titles = new WeakHashMap<>();
+    final Map<DocFileElement, String> titles = new WeakHashMap<>();
 
     /**
      * Constructs SystemPropertiesWriter object.
@@ -133,29 +131,26 @@ private Map<String, List<IndexItem>> groupSystemProperties() {
 
     private Content createLink(IndexItem i) {
         assert i.getDocTree().getKind() == DocTree.Kind.SYSTEM_PROPERTY : i;
-        Element element = i.getElement();
+        var element = i.getElement();
         if (element instanceof OverviewElement) {
             return links.createLink(pathToRoot.resolve(i.getUrl()),
                     resources.getText("doclet.Overview"));
-        } else if (element instanceof DocletElement e) {
-            // Implementations of DocletElement do not override equals and
-            // hashCode; putting instances of DocletElement in a map is not
-            // incorrect, but might well be inefficient
-            String t = titles.computeIfAbsent(element, utils::getHTMLTitle);
+        } else if (element instanceof DocFileElement e) {
+            var fo = e.getFileObject();
+            var t = titles.computeIfAbsent(e, this::getFileTitle);
             if (t.isBlank()) {
                 // The user should probably be notified (a warning?) that this
                 // file does not have a title
-                Path p = Path.of(e.getFileObject().toUri());
+                var p = Path.of(fo.toUri());
                 t = p.getFileName().toString();
             }
-            ContentBuilder b = new ContentBuilder();
-            b.add(HtmlTree.CODE(Text.of(i.getHolder() + ": ")));
-            // non-program elements should be displayed using a normal font
-            b.add(t);
+            var b = new ContentBuilder()
+                    .add(HtmlTree.CODE(Text.of(i.getHolder() + ": ")))
+                    .add(t);
             return links.createLink(pathToRoot.resolve(i.getUrl()), b);
         } else {
             // program elements should be displayed using a code font
-            Content link = links.createLink(pathToRoot.resolve(i.getUrl()), i.getHolder());
+            var link = links.createLink(pathToRoot.resolve(i.getUrl()), i.getHolder());
             return HtmlTree.CODE(link);
         }
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java
index 34573dd7794..b059b0fdb36 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,6 +75,13 @@ public ContentBuilder add(CharSequence text) {
         return this;
     }
 
+    /**
+     * {@return the contents of this builder}
+     */
+    public List<Content> getContents() {
+        return contents;
+    }
+
     @Override
     public boolean write(Writer writer, String newline, boolean atNewline) throws IOException {
         for (Content content: contents) {
@@ -100,6 +107,11 @@ public int charCount() {
         return n;
     }
 
+    @Override
+    public boolean isPhrasingContent() {
+        return contents.stream().allMatch(Content::isPhrasingContent);
+    }
+
     private void ensureMutableContents() {
         if (contents.isEmpty())
             contents = new ArrayList<>();
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Entity.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Entity.java
index c96063d703f..542e081a583 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Entity.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Entity.java
@@ -68,6 +68,11 @@ public boolean isEmpty() {
         return false;
     }
 
+    @Override
+    public boolean isPhrasingContent() {
+        return true;
+    }
+
     @Override
     public int charCount() {
         return 1;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
index 77d09c7226e..c4a223a94c7 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
@@ -35,6 +35,7 @@
 import java.util.Locale;
 
 import jdk.javadoc.internal.doclets.formats.html.Content;
+import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 
@@ -60,7 +61,7 @@ public class Head extends Content {
     private Script mainBodyScript;
     private final List<Script> scripts;
     // Scripts added via --add-script option
-    private List<DocPath> additionalScripts = List.of();
+    private List<HtmlConfiguration.JavaScriptFile> additionalScripts = List.of();
     private final List<Content> extraContent;
     private boolean addDefaultScript = true;
     private DocPath canonicalLink;
@@ -176,7 +177,7 @@ public Head setStylesheets(DocPath main, List<DocPath> additional, List<DocPath>
      * @param scripts the list of additional script files
      * @return this object
      */
-    public Head setAdditionalScripts(List<DocPath> scripts) {
+    public Head setAdditionalScripts(List<HtmlConfiguration.JavaScriptFile> scripts) {
         this.additionalScripts = scripts;
         return this;
     }
@@ -346,7 +347,7 @@ private void addStylesheet(HtmlTree head, DocPath stylesheet) {
 
     private void addScripts(HtmlTree head) {
         if (addDefaultScript) {
-            addScriptElement(head, DocPaths.SCRIPT_FILES.resolve(DocPaths.SCRIPT_JS));
+            addScriptElement(head, DocPaths.SCRIPT_JS);
         }
         if (index) {
             if (pathToRoot != null && mainBodyScript != null) {
@@ -356,11 +357,11 @@ private void addScripts(HtmlTree head) {
                         .append(";\n")
                         .append("loadScripts(document, 'script');");
             }
-            addScriptElement(head, DocPaths.SCRIPT_FILES.resolve(DocPaths.JQUERY_JS));
-            addScriptElement(head, DocPaths.SCRIPT_FILES.resolve(DocPaths.JQUERY_UI_JS));
+            addScriptElement(head, DocPaths.JQUERY_JS);
+            addScriptElement(head, DocPaths.JQUERY_UI_JS);
         }
-        for (DocPath path : additionalScripts) {
-            addScriptElement(head, DocPaths.SCRIPT_FILES.resolve(path));
+        for (HtmlConfiguration.JavaScriptFile javaScriptFile : additionalScripts) {
+            addScriptElement(head, javaScriptFile);
         }
         for (Script script : scripts) {
             head.add(script.asContent());
@@ -368,7 +369,13 @@ private void addScripts(HtmlTree head) {
     }
 
     private void addScriptElement(HtmlTree head, DocPath filePath) {
-        DocPath scriptFile = pathToRoot.resolve(filePath);
+        DocPath scriptFile = pathToRoot.resolve(DocPaths.SCRIPT_FILES).resolve(filePath);
         head.add(HtmlTree.SCRIPT(scriptFile.getPath()));
     }
+
+    private void addScriptElement(HtmlTree head, HtmlConfiguration.JavaScriptFile script) {
+        DocPath scriptFile = pathToRoot.resolve(DocPaths.SCRIPT_FILES).resolve(script.path());
+        HtmlTree scriptTag = HtmlTree.SCRIPT(scriptFile.getPath());
+        head.add(script.isModule() ? scriptTag.put(HtmlAttr.TYPE, "module") : scriptTag);
+    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
index 0ec4033a929..57adb966326 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
@@ -233,6 +233,20 @@ public HtmlTree add(List<? extends Content> list) {
         return this;
     }
 
+    /**
+     * {@return the attributes of this node}
+     */
+    public Map<HtmlAttr, String> getAttrs() {
+        return attrs;
+    }
+
+    /**
+     * {@return the contents of this node}
+     */
+    public List<Content> getContents() {
+        return content;
+    }
+
     /**
      * Adds each of a collection of items, using a map function to create the content for each item.
      *
@@ -1009,6 +1023,11 @@ public boolean isEmpty() {
         return (!hasContent() && !hasAttrs());
     }
 
+    @Override
+    public boolean isPhrasingContent() {
+        return tagName.phrasingContent;
+    }
+
     /**
      * Returns true if the HTML tree has content.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java
index 5127be87ccd..a71ea7831da 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
 
 import java.io.IOException;
 import java.io.Writer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import jdk.javadoc.internal.doclets.formats.html.Content;
 
@@ -55,6 +57,16 @@ public int charCount() {
         };
     }
 
+    /**
+     * Creates HTML for a fragment of Markdown output.
+     *
+     * @param markdownOutput the fragment
+     * @return the HTML
+     */
+    public static RawHtml markdown(CharSequence markdownOutput) {
+        return of(markdownOutput);
+    }
+
     /**
      * Creates HTML for the start of an element.
      *
@@ -129,6 +141,24 @@ public boolean isEmpty() {
         return rawHtmlContent.isEmpty();
     }
 
+    Pattern tag = Pattern.compile("<(?<tag>[A-Za-z0-9]+)(\\s|>)");
+    @Override
+    public boolean isPhrasingContent() {
+        Matcher m = tag.matcher(rawHtmlContent);
+        while (m.find()) {
+            try {
+                var tn = TagName.of(m.group("tag"));
+                if (!tn.phrasingContent) {
+                    return false;
+                }
+            } catch (IllegalArgumentException e) {
+                // unknown tag
+                return false;
+            }
+        }
+        return true;
+    }
+
     @Override
     public String toString() {
         return rawHtmlContent;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java
index 67635e18377..d849c2f1798 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java
@@ -25,6 +25,8 @@
 
 package jdk.javadoc.internal.doclets.formats.html.markup;
 
+import java.util.Locale;
+
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
 
 /**
@@ -34,20 +36,20 @@
  * @see <a href="https://www.w3.org/TR/html51/syntax.html#tag-name">HTML 5.1: Tag Name</a>
  */
 public enum TagName {
-    A,
+    A(true),
     ASIDE,
-    BUTTON,
+    BUTTON(true),
     BLOCKQUOTE,
     BODY,
-    BR,
+    BR(true),
     CAPTION,
-    CODE,
+    CODE(true),
     DD,
     DETAILS,
     DIV,
     DL,
     DT,
-    EM,
+    EM(true),
     FOOTER,
     FORM,
     H1,
@@ -60,29 +62,29 @@ public enum TagName {
     HEADER,
     HR,
     HTML,
-    I,
-    IMG,
-    INPUT,
-    LABEL,
+    I(true),
+    IMG(true),
+    INPUT(true),
+    LABEL(true),
     LI,
     LISTING,
-    LINK,
+    LINK(true),
     MAIN,
     MENU,
     META,
     NAV,
-    NOSCRIPT,
+    NOSCRIPT(true),
     OL,
     P,
     PRE,
-    SCRIPT,
+    SCRIPT(true),
     SECTION,
-    SMALL,
-    SPAN,
-    STRONG,
-    SUB,
+    SMALL(true),
+    SPAN(true),
+    STRONG(true),
+    SUB(true),
     SUMMARY,
-    SUP,
+    SUP(true),
     TABLE,
     TBODY,
     THEAD,
@@ -91,15 +93,26 @@ public enum TagName {
     TITLE,
     TR,
     UL,
-    WBR;
+    WBR(true);
 
     public final String value;
+    public final boolean phrasingContent;
+
+    static TagName of(String s) {
+        return valueOf(s.toUpperCase(Locale.ROOT));
+    }
 
     TagName() {
+        this(false);
+    }
+
+    TagName(boolean phrasingContent) {
         this.value = Utils.toLowerCase(name());
+        this.phrasingContent = phrasingContent;
     }
 
     public String toString() {
         return value;
     }
+
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Text.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Text.java
index b96d86577a6..e05ca73001a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Text.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Text.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,6 +66,11 @@ public boolean isEmpty() {
         return string.isEmpty();
     }
 
+    @Override
+    public boolean isPhrasingContent() {
+        return true;
+    }
+
     @Override
     public int charCount() {
         return charCount(string);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TextBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TextBuilder.java
index 5baa581450a..6c4d66024c5 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TextBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TextBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,14 +41,14 @@ public class TextBuilder extends Content {
     private final StringBuilder stringBuilder;
 
     /**
-     * Constructor to construct StringContent object.
+     * Constructor to construct an empty TextBuilder object.
      */
     public TextBuilder() {
         stringBuilder = new StringBuilder();
     }
 
     /**
-     * Constructor to construct StringContent object with some initial content.
+     * Constructor to construct a TextBuilder object with some initial content.
      *
      * @param initialContent initial content for the object
      */
@@ -58,7 +58,7 @@ public TextBuilder(CharSequence initialContent) {
     }
 
     /**
-     * Adds content for the StringContent object.
+     * Adds content for the TextBuilder object.
      *
      * @param strContent string content to be added
      */
@@ -74,6 +74,11 @@ public boolean isEmpty() {
         return (stringBuilder.length() == 0);
     }
 
+    @Override
+    public boolean isPhrasingContent() {
+        return true;
+    }
+
     @Override
     public int charCount() {
         return stringBuilder.length();
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
index f0777a6ba96..8086e0d88b3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
@@ -372,9 +372,13 @@ dl.notes > dt {
     color:var(--body-text-color);
 }
 dl.notes > dd {
-    margin:5px 10px 10px 0;
+    margin:5px 10px 10px 15px;
     font-size:var(--block-font-size);
-    font-family:var(--block-font-family)
+    font-family:var(--block-font-family);
+}
+dl.notes > dd > ul, dl.notes > dd > ol {
+    margin-bottom: 1em;
+    margin-top: 1em;
 }
 dl.name-value > dt {
     margin-left:1px;
@@ -547,8 +551,9 @@ ul.ref-list > li {
     margin-top:0;
     margin-bottom:1px;
 }
-ul.tag-list, ul.tag-list-long {
+dl.notes > dd > ul.tag-list, dl.notes > dd > ul.tag-list-long {
     padding-left: 0;
+    margin: 0;
     list-style: none;
 }
 ul.tag-list li {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SeeTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SeeTaglet.java
index 8e029c5fbb5..9052b1a49aa 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SeeTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SeeTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -158,7 +158,7 @@ private Content seeTagOutput(Element element, SeeTree seeTag) {
         assert !ref.isEmpty();
         DocTree ref0 = ref.get(0);
         switch (ref0.getKind()) {
-            case TEXT, START_ELEMENT -> {
+            case TEXT, MARKDOWN, START_ELEMENT -> {
                 // @see "Reference"
                 // @see <a href="...">...</a>
                 return htmlWriter.commentTagsToContent(element, ref, false, false);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java
index e7a7620e5eb..e55ede7a7e1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,16 +37,18 @@
 
 import com.sun.source.doctree.DocTree;
 import com.sun.source.doctree.SpecTree;
-import com.sun.source.doctree.TextTree;
 import com.sun.source.util.DocTreePath;
 
 import jdk.javadoc.doclet.Taglet;
 import jdk.javadoc.internal.doclets.formats.html.Contents;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
 import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
+import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
 import jdk.javadoc.internal.doclets.formats.html.markup.Text;
 import jdk.javadoc.internal.doclets.formats.html.Content;
+import jdk.javadoc.internal.doclets.formats.html.markup.TextBuilder;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
@@ -122,14 +124,35 @@ private Content specTagToContent(Element holder, SpecTree specTree) {
         List<? extends DocTree> specTreeLabel = specTree.getTitle();
         Content label = htmlWriter.commentTagsToContent(holder, specTreeLabel, tagletWriter.context.isFirstSentence);
         return getExternalSpecContent(holder, specTree, specTreeURL,
-                textOf(specTreeLabel).replaceAll("\\s+", " "), label);
+                textOf(label).replaceAll("\\s+", " "), label);
     }
 
-    private String textOf(List<? extends DocTree> trees) {
-        return trees.stream()
-                .filter(dt -> dt instanceof TextTree)
-                .map(dt -> ((TextTree) dt).getBody().trim())
-                .collect(Collectors.joining(" "));
+    // this is here, for now, but might be a useful addition elsewhere,
+    // perhaps as a method on Content
+    private String textOf(Content c) {
+        return appendText(new StringBuilder(), c).toString();
+    }
+
+    private StringBuilder appendText(StringBuilder sb, Content c) {
+        if (c instanceof ContentBuilder cb) {
+            appendText(sb, cb.getContents());
+        } else if (c instanceof HtmlTree ht) {
+            appendText(sb, ht.getContents());
+        } else if (c instanceof RawHtml rh) {
+            sb.append(rh.toString().replaceAll("<[^>]*>", ""));
+        } else if (c instanceof TextBuilder tb) {
+            sb.append(tb.toString());
+        } else if (c instanceof Text t) {
+            sb.append(t.toString());
+        } else if (c instanceof Entity e) {
+            sb.append(e.toString());
+        }
+        return sb;
+    }
+
+    private StringBuilder appendText(StringBuilder sb, List<? extends Content> contents) {
+        contents.forEach(c -> appendText(sb, c));
+        return sb;
     }
 
     Content getExternalSpecContent(Element holder,
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
index db8b855eb72..f10bd27d35c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -567,7 +567,7 @@ public boolean isJavaFXMode() {
 
     //<editor-fold desc="DocLint support">
 
-    private DocLint doclint;
+    protected DocLint doclint;
 
     Map<CompilationUnitTree, Boolean> shouldCheck = new HashMap<>();
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java
index e0889a84da5..b123e6f2556 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -626,7 +626,7 @@ public DocCommentInfo getHtmlCommentInfo(Element e) {
 
     public DocCommentTree parse(URI uri, String text) {
         return trees.getDocCommentTree(new SimpleJavaFileObject(
-                uri, JavaFileObject.Kind.SOURCE) {
+                uri, JavaFileObject.Kind.HTML) {
             @Override @DefinedBy(Api.COMPILER)
             public CharSequence getCharContent(boolean ignoreEncoding) {
                 return text;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/DocFileElement.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/DocFileElement.java
index 3975bd7f3d9..35fb0dfab1d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/DocFileElement.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/DocFileElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package jdk.javadoc.internal.doclets.toolkit;
 
+import java.util.Objects;
+
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ModuleElement;
 import javax.lang.model.element.PackageElement;
@@ -43,7 +45,7 @@ public class DocFileElement implements DocletElement {
     private final FileObject fo;
 
     /**
-     * Creates a pseudo-element that wraps a {@code doc-files} HTML file.
+     * Creates a pseudo-element that wraps a {@code doc-files} documentation file.
      *
      * @param utils the standard utilities class
      * @param element the module element or package element that "owns" the {@code doc-files} subdirectory
@@ -89,5 +91,18 @@ public FileObject getFileObject() {
     public Kind getSubKind() {
         return Kind.DOCFILE;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DocFileElement that = (DocFileElement) o;
+        return element.equals(that.element) && fo.equals(that.fo);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(element, fo);
+    }
 }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java
index 37965f56c5f..033703e073f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@
 import com.sun.source.doctree.LiteralTree;
 import com.sun.source.doctree.ParamTree;
 import com.sun.source.doctree.ProvidesTree;
+import com.sun.source.doctree.RawTextTree;
 import com.sun.source.doctree.ReferenceTree;
 import com.sun.source.doctree.ReturnTree;
 import com.sun.source.doctree.SeeTree;
@@ -428,6 +429,12 @@ public List<? extends DocTree> visitParam(ParamTree node, Void p) {
                 return node.getDescription();
             }
 
+            @Override
+            public List<? extends DocTree> visitRawText(RawTextTree node, Void p) {
+                // not ideal, but better than returning an empty list
+                return asList(node.getContent());
+            }
+
             @Override
             public List<? extends DocTree> visitReturn(ReturnTree node, Void p) {
                 return node.getDescription();
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/NewAPIBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/NewAPIBuilder.java
index 171abf44be6..0220f6155a3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/NewAPIBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/NewAPIBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,8 @@
 
 package jdk.javadoc.internal.doclets.toolkit.util;
 
-import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.SinceTree;
+
 import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
 
 import javax.lang.model.element.Element;
@@ -54,11 +55,13 @@ private static boolean isNewAPI(Element e, Utils utils, List<String> releases) {
         if (!utils.hasDocCommentTree(e)) {
             return false;
         }
-        List<? extends DocTree> since = utils.getBlockTags(e, SINCE);
-        if (since.isEmpty()) {
+        var sinceTrees = utils.getBlockTags(e, SINCE, SinceTree.class);
+        if (sinceTrees.isEmpty()) {
             return false;
         }
-        CommentHelper ch = utils.getCommentHelper(e);
-        return since.stream().anyMatch(tree -> releases.contains(ch.getBody(tree).toString()));
+
+        // assumes a simple string value with no formatting
+        return sinceTrees.stream()
+                .anyMatch(tree -> releases.contains(tree.getBody().getFirst().toString()));
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
index 7606de59341..c29feec1712 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -97,7 +97,6 @@
 import com.sun.source.doctree.DocCommentTree;
 import com.sun.source.doctree.DocTree;
 import com.sun.source.doctree.DocTree.Kind;
-import com.sun.source.doctree.EndElementTree;
 import com.sun.source.doctree.ParamTree;
 import com.sun.source.doctree.ProvidesTree;
 import com.sun.source.doctree.ReturnTree;
@@ -106,8 +105,6 @@
 import com.sun.source.doctree.SerialFieldTree;
 import com.sun.source.doctree.SerialTree;
 import com.sun.source.doctree.SpecTree;
-import com.sun.source.doctree.StartElementTree;
-import com.sun.source.doctree.TextTree;
 import com.sun.source.doctree.ThrowsTree;
 import com.sun.source.doctree.UsesTree;
 import com.sun.source.tree.CompilationUnitTree;
@@ -1331,38 +1328,6 @@ int compareStrings(boolean caseSensitive, String s1, String s2) {
         return secondaryCollator.compare(s1, s2);
     }
 
-    public String getHTMLTitle(Element element) {
-        List<? extends DocTree> preamble = getPreamble(element);
-        StringBuilder sb = new StringBuilder();
-        boolean titleFound = false;
-        loop:
-        for (DocTree dt : preamble) {
-            switch (dt.getKind()) {
-                case START_ELEMENT -> {
-                    StartElementTree nodeStart = (StartElementTree) dt;
-                    if (Utils.toLowerCase(nodeStart.getName().toString()).equals("title")) {
-                        titleFound = true;
-                    }
-                }
-                case END_ELEMENT -> {
-                    EndElementTree nodeEnd = (EndElementTree) dt;
-                    if (Utils.toLowerCase(nodeEnd.getName().toString()).equals("title")) {
-                        break loop;
-                    }
-                }
-                case TEXT -> {
-                    TextTree nodeText = (TextTree) dt;
-                    if (titleFound)
-                        sb.append(nodeText.getBody());
-                }
-                default -> {
-                }
-                // do nothing
-            }
-        }
-        return sb.toString().trim();
-    }
-
     private static class DocCollator {
         private final Map<String, CollationKey> keys;
         private final Collator instance;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
index 7bc63369903..559e520c7c9 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,6 +75,7 @@
 import com.sun.source.doctree.LiteralTree;
 import com.sun.source.doctree.ParamTree;
 import com.sun.source.doctree.ProvidesTree;
+import com.sun.source.doctree.RawTextTree;
 import com.sun.source.doctree.ReferenceTree;
 import com.sun.source.doctree.ReturnTree;
 import com.sun.source.doctree.SerialDataTree;
@@ -311,6 +312,12 @@ private void reportReference(String code, Object... args) {
         env.messages.report(REFERENCE, Kind.WARNING, env.currPath.getLeaf(), code, args);
     }
 
+    @Override
+    public Void scan(DocTreePath path, Void unused) {
+        // interposition point for all scans
+        return super.scan(path, unused);
+    }
+
     @Override @DefinedBy(Api.COMPILER_TREE)
     public Void visitDocComment(DocCommentTree tree, Void ignore) {
         scan(tree.getFirstSentence(), ignore);
@@ -1006,8 +1013,11 @@ public Void visitReturn(ReturnTree tree, Void ignore) {
             env.messages.warning(REFERENCE, tree, "dc.exists.return");
         }
         if (tree.isInline()) {
-            DocCommentTree dct = getCurrentPath().getDocComment();
-            if (dct.getFirstSentence().isEmpty() || tree != dct.getFirstSentence().get(0)) {
+            var dct = getCurrentPath().getDocComment();
+            var first = dct.getFirstSentence().stream()
+                    .filter(t -> !isBlank(t))
+                    .findFirst();
+            if (first.isEmpty() || first.get() != tree) {
                 env.messages.warning(SYNTAX, tree, "dc.return.not.first");
             }
         }
@@ -1021,6 +1031,14 @@ public Void visitReturn(ReturnTree tree, Void ignore) {
         return super.visitReturn(tree, ignore);
     }
 
+    private static boolean isBlank(DocTree t) {
+        return switch (t.getKind()) {
+            case TEXT -> ((TextTree) t).getBody().isBlank();
+            case MARKDOWN -> ((RawTextTree) t).getContent().isBlank();
+            default -> false;
+        };
+    }
+
     @Override @DefinedBy(Api.COMPILER_TREE)
     public Void visitSerialData(SerialDataTree tree, Void ignore) {
         warnIfEmpty(tree, tree.getDescription());
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Env.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Env.java
index f576da1d485..f2940963f17 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Env.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Env.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,8 @@
 
 package jdk.javadoc.internal.doclint;
 
-
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -45,7 +43,6 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.Modifier;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
@@ -61,7 +58,6 @@
 import com.sun.tools.javac.model.JavacTypes;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.util.MatchingUtils;
-import com.sun.tools.javac.util.StringUtils;
 import jdk.javadoc.internal.tool.AccessLevel;
 
 /**
@@ -135,6 +131,7 @@ void init(DocTrees trees, Elements elements, Types types) {
         this.trees = trees;
         this.elements = elements;
         this.types = types;
+
     }
 
     void initTypes() {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java
index 6407196a2ab..4422c2caa27 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java
@@ -54,6 +54,7 @@
 import com.sun.tools.javac.util.ClientCodeException;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.ModuleHelper;
 import com.sun.tools.javac.util.StringUtils;
 
 import jdk.internal.opt.CommandLine;
@@ -561,6 +562,17 @@ private Result parseAndExecute(List<String> argList, Iterable<? extends JavaFile
             }
         }
 
+        // Allow doclets to access internal API if the appropriate
+        // option is given on the command line.
+        // A better solution would be to modify the javadoc API to
+        // permit an instance of an appropriately configured instance
+        // of a doclet to be specified instead of the name of the
+        // doclet class and optional doclet path.
+        // See https://bugs.openjdk.org/browse/JDK-8263219
+        if (options.compilerOptions().isSet("accessInternalAPI")) {
+            ModuleHelper.addExports(ModuleHelper.class.getModule(), doclet.getClass().getModule());
+        }
+
         JavadocTool comp = JavadocTool.make0(context);
         if (comp == null) return ABNORMAL;
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOptions.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOptions.java
index d478e878a5c..17bf628114a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOptions.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -402,6 +402,13 @@ public void process() throws InvalidValueException {
                 }
             },
 
+            new ToolOption("--disable-line-doc-comments", EXTENDED) {
+                @Override
+                public void process() throws InvalidValueException {
+                    processCompilerOption(Option.DISABLE_LINE_DOC_COMMENTS, primaryName);
+                }
+            },
+
             // ----- doclet options -----
 
             // This option exists so that it is documented in the command-line help.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties
index ef9425a02be..7db420e46d5 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties
@@ -270,6 +270,10 @@ main.opt.patch.module.desc=\
     Override or augment a module with classes and resources in\n\
     JAR files or directories
 
+main.opt.disable.line.doc.comments.desc=\
+    Disable support for documentation comments with lines\n\
+    beginning '///'
+
 main.Xusage.foot=\n\
 These options are non-standard and subject to change without notice.
 
diff --git a/src/jdk.javadoc/share/classes/module-info.java b/src/jdk.javadoc/share/classes/module-info.java
index ee84482204a..422707e7fbd 100644
--- a/src/jdk.javadoc/share/classes/module-info.java
+++ b/src/jdk.javadoc/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,15 +52,15 @@
  * @provides javax.tools.DocumentationTool
  * @provides javax.tools.Tool
  *
- *
  * @moduleGraph
  * @since 9
  */
 module jdk.javadoc {
-    requires java.xml;
 
     requires transitive java.compiler;
     requires transitive jdk.compiler;
+
+    requires jdk.internal.md;
     requires jdk.internal.opt;
 
     exports jdk.javadoc.doclet;
diff --git a/src/jdk.javadoc/share/man/javadoc.1 b/src/jdk.javadoc/share/man/javadoc.1
index 8c149ff58f0..73d12efbf30 100644
--- a/src/jdk.javadoc/share/man/javadoc.1
+++ b/src/jdk.javadoc/share/man/javadoc.1
@@ -154,6 +154,8 @@ descriptions of using these options:
 .IP \[bu] 2
 \f[V]--class-path\f[R], \f[V]-classpath\f[R], or \f[V]-cp\f[R]
 .IP \[bu] 2
+\f[V]--disable-line-doc-comments\f[R]
+.IP \[bu] 2
 \f[V]--enable-preview\f[R]
 .IP \[bu] 2
 \f[V]-encoding\f[R]
@@ -182,26 +184,41 @@ The following options are the core \f[V]javadoc\f[R] options that are
 not equivalent to a corresponding \f[V]javac\f[R] option:
 .TP
 \f[V]-breakiterator\f[R]
-Computes the first sentence with \f[V]BreakIterator\f[R].
-The first sentence is copied to the package, class, or member summary
-and to the alphabetic index.
-The \f[V]BreakIterator\f[R] class is used to determine the end of a
-sentence for all languages except for English.
-.RS
-.IP \[bu] 2
-English default sentence-break algorithm --- Stops at a period followed
-by a space or an HTML block tag, such as \f[V]<P>\f[R].
-.IP \[bu] 2
-Breakiterator sentence-break algorithm --- Stops at a period, question
+Computes the first sentence of the description in a documentation
+comment using an instance of \f[V]java.text.BreakIterator\f[R] to detect
+\f[I]sentence breaks\f[R].
+The rules that are used depend on the \f[B]current locale\f[R]: for
+example, for English, a sentence break occurs after a period, question
 mark, or exclamation point followed by a space when the next word starts
 with a capital letter.
-This is meant to handle most abbreviations (such as \[dq]The serial no.
+(This is meant to handle most abbreviations, such as \[dq]The serial no.
 is valid\[dq], but will not handle \[dq]Mr.
-Smith\[dq]).
-The \f[V]-breakiterator\f[R] option doesn\[aq]t stop at HTML tags or
-sentences that begin with numbers or symbols.
-The algorithm stops at the last period in \f[V]../filename\f[R], even
-when embedded in an HTML tag.
+Smith\[dq].)
+.RS
+.PP
+The option is enabled by default if the language of the current locale
+is not English.
+If the language of the current locale is English, and the
+\f[V]-breakiterator\f[R] option is not given, a simple default algorithm
+is used, which just looks for a period followed by a space.
+.PP
+In a traditional \f[V]/**...*/\f[R] comment, the search for the end of
+the first sentence is terminated by an HTML block tag, such as
+\f[V]<p>\f[R], \f[V]<pre>\f[R], or the tag for a heading.
+.PP
+In a Markdown \f[V]///\f[R] comment, the search for the end of the first
+sentence skips over any characters enclosed in code spans and links, and
+is terminated by the end of the initial block, as indicated by a blank
+line or the beginning of the next block, such as a list, thematic break,
+or an HTML block.
+.PP
+The first sentence of the description in a documentation comment is used
+in summary tables, index pages, and other situations where a short
+summary is required.
+For more explicit control in any individual documentation comment,
+enclose the contents of the first sentence in a
+\f[V]{\[at]summary ...}\f[R] tag, or when applicable, in a
+\[ga]{\[at]return ...} tag.
 .RE
 .TP
 \f[V]-doclet\f[R] \f[I]class\f[R]
@@ -505,8 +522,7 @@ Allow JavaScript in documentation comments, and options whose value is
 \f[I]html-code\f[R].
 .TP
 \f[V]-author\f[R]
-Includes the text of any \f[V]author\f[R] tags in the generated
-documentation.
+Includes the \f[V]\[at]author\f[R] text in the generated docs.
 .TP
 \f[V]-bottom\f[R] \f[I]html-code\f[R]
 Specifies the text to be placed at the bottom of each generated page.
@@ -970,8 +986,8 @@ is used.
 .RE
 .TP
 \f[V]-nosince\f[R]
-Omits from the generated documentation the \f[V]Since\f[R] sections
-derived from any \f[V]since\f[R] tags.
+Omits from the generated documents the \f[V]Since\f[R] sections
+associated with the \f[V]\[at]since\f[R] tags.
 .TP
 \f[V]-notimestamp\f[R]
 Suppresses the time stamp, which is hidden in an HTML comment in the
@@ -994,34 +1010,30 @@ Documents overridden methods in the detail or summary sections.
 The default is \f[V]detail\f[R].
 .TP
 \f[V]-overview\f[R] \f[I]filename\f[R]
-Specifies that the \f[V]javadoc\f[R] tool should retrieve the text for
-the overview documentation from the source file specified by
-\f[V]filename\f[R] and place it on the Overview page
+Specifies that the \f[V]javadoc\f[R] tool should retrieve the content
+for the overview documentation from the file specified by
+\f[I]filename\f[R] and place it on the Overview page
 (\f[V]overview-summary.html\f[R]).
-A relative path specified with the file name is relative to the current
-working directory.
+If the \f[I]filename\f[R] is a relative path, it is evaluated relative
+to the current working directory.
 .RS
 .PP
-While you can use any name you want for the \f[I]filename\f[R] value and
-place it anywhere you want, it is typical to name it
-\f[V]overview.html\f[R] and place it in the source tree at the directory
-that contains the topmost package directories.
-In this location, no path is needed when documenting packages, because
-the \f[V]-sourcepath\f[R] option points to this file.
-.IP \[bu] 2
-\f[B]Linux and macOS:\f[R] For example, if the source tree for the
-\f[V]java.lang\f[R] package is \f[V]src/classes/java/lang/\f[R], then
-you could place the overview file at
-\f[V]src/classes/overview.html\f[R].
-.IP \[bu] 2
-\f[B]Windows:\f[R] For example, if the source tree for the
-\f[V]java.lang\f[R] package is
-\f[V]src\[rs]classes\[rs]java\[rs]lang\[rs]\f[R], then you could place
-the overview file at \f[V]src\[rs]classes\[rs]overview.html\f[R]
+The file may be an HTML file, with a filename ending in \f[V].html\f[R],
+or a Markdown file, with a filename ending in \f[V].md\f[R].
+.PD 0
+.P
+.PD
+If the file is an HTML file, the content for the overview documentation
+is taken from the \f[V]<main>\f[R] element in the file, if one is
+present, or from the \f[V]<body>\f[R] element is there is no
+\f[V]<main>\f[R] element.
+If the file is a Markdown file, the entire content of the file is used.
 .PP
-The overview page is created only when you pass two or more package
-names to the \f[V]javadoc\f[R] tool.
 The title on the overview page is set by \f[V]-doctitle\f[R].
+.PP
+\f[I]Note:\f[R] older versions of the \f[V]javadoc\f[R] tool assumed
+that any use of this option was for an HTML file, and allowed any
+extension for the \f[I]filename\f[R].
 .RE
 .TP
 \f[V]-serialwarn\f[R]
@@ -1201,11 +1213,10 @@ To access the generated Use page, go to the class or package and click
 the \f[B]USE\f[R] link in the navigation bar.
 .TP
 \f[V]-version\f[R]
-Includes the text of any \f[V]version\f[R] tags in the generated
-documentation.
+Includes the version text in the generated docs.
 This text is omitted by default.
-Note: To find out what version of the \f[V]javadoc\f[R] tool you are
-using, use the \f[V]--version\f[R] option (with two hyphens).
+To find out what version of the \f[V]javadoc\f[R] tool you are using,
+use the \f[V]--version\f[R] option (with two hyphens).
 .TP
 \f[V]-windowtitle\f[R] \f[I]title\f[R]
 Specifies the title to be placed in the HTML \f[V]<title>\f[R] tag.
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPEntries.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPEntries.java
index 8314a2b608a..09d0c0fe27a 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPEntries.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPEntries.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,13 @@
 
 package com.sun.tools.jdeprscan.scan;
 
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.constantpool.*;
 import java.util.ArrayList;
 import java.util.Formatter;
 import java.util.List;
 import java.util.Locale;
 
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPool;
-
-import static com.sun.tools.classfile.ConstantPool.CPInfo;
-
 /**
  * A container for selected constant pool entries. There are currently
  * lists that contain the following types of CP entries:
@@ -45,15 +42,21 @@
  *  - CONSTANT_InterfaceMethodref_info
  */
 class CPEntries {
-    final List<ConstantPool.CONSTANT_Class_info> classes = new ArrayList<>();
-    final List<ConstantPool.CONSTANT_Fieldref_info> fieldRefs = new ArrayList<>();
-    final List<ConstantPool.CONSTANT_Methodref_info> methodRefs = new ArrayList<>();
-    final List<ConstantPool.CONSTANT_InterfaceMethodref_info> intfMethodRefs = new ArrayList<>();
+    final List<ClassEntry> classes = new ArrayList<>();
+    final List<FieldRefEntry> fieldRefs = new ArrayList<>();
+    final List<MethodRefEntry> methodRefs = new ArrayList<>();
+    final List<InterfaceMethodRefEntry> intfMethodRefs = new ArrayList<>();
 
-    public static CPEntries loadFrom(ClassFile cf) {
+    public static CPEntries loadFrom(ClassModel cf) {
         CPEntries entries = new CPEntries();
-        for (CPInfo cpi : cf.constant_pool.entries()) {
-            cpi.accept(new CPSelector(), entries);
+        for (PoolEntry cpi : cf.constantPool()) {
+            switch (cpi) {
+                case ClassEntry ce -> entries.classes.add(ce);
+                case MethodRefEntry mref -> entries.methodRefs.add(mref);
+                case InterfaceMethodRefEntry imref -> entries.intfMethodRefs.add(imref);
+                case FieldRefEntry fref -> entries.fieldRefs.add(fref);
+                default -> {}
+            }
         }
         return entries;
     }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPSelector.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPSelector.java
deleted file mode 100644
index ab81c4503da..00000000000
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPSelector.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.jdeprscan.scan;
-
-import com.sun.tools.classfile.ConstantPool;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_Dynamic_info;
-
-/**
- * A visitor that selects constant pool entries by type and adds
- * them to the given CPEntries object.
- */
-class CPSelector implements ConstantPool.Visitor<Void,CPEntries> {
-    @Override
-    public Void visitClass(ConstantPool.CONSTANT_Class_info info, CPEntries p) {
-        p.classes.add(info);
-        return null;
-    }
-
-    @Override
-    public Void visitDouble(ConstantPool.CONSTANT_Double_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitFieldref(ConstantPool.CONSTANT_Fieldref_info info, CPEntries p) {
-        p.fieldRefs.add(info);
-        return null;
-    }
-
-    @Override
-    public Void visitFloat(ConstantPool.CONSTANT_Float_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitInteger(ConstantPool.CONSTANT_Integer_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitInterfaceMethodref(ConstantPool.CONSTANT_InterfaceMethodref_info info, CPEntries p) {
-        p.intfMethodRefs.add(info);
-        return null;
-    }
-
-    @Override
-    public Void visitInvokeDynamic(ConstantPool.CONSTANT_InvokeDynamic_info info, CPEntries p) {
-        return null;
-    }
-
-    public Void visitDynamicConstant(CONSTANT_Dynamic_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitLong(ConstantPool.CONSTANT_Long_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitMethodref(ConstantPool.CONSTANT_Methodref_info info, CPEntries p) {
-        p.methodRefs.add(info);
-        return null;
-    }
-
-    @Override
-    public Void visitMethodHandle(ConstantPool.CONSTANT_MethodHandle_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitMethodType(ConstantPool.CONSTANT_MethodType_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitModule(ConstantPool.CONSTANT_Module_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitNameAndType(ConstantPool.CONSTANT_NameAndType_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitPackage(ConstantPool.CONSTANT_Package_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitString(ConstantPool.CONSTANT_String_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitUtf8(ConstantPool.CONSTANT_Utf8_info info, CPEntries p) {
-        return null;
-    }
-}
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/ClassFinder.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/ClassFinder.java
index ebb847bbe99..b447bad8197 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/ClassFinder.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/ClassFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,9 @@
 
 package com.sun.tools.jdeprscan.scan;
 
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPoolException;
-
 import java.io.IOException;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
 import java.net.URI;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
@@ -92,9 +91,9 @@ public void addJrt() {
      * @param className the class to search for
      * @return a ClassFile instance, or null if not found
      */
-    public ClassFile find(String className) {
+    public ClassModel find(String className) {
         for (PathEntry pe : list) {
-            ClassFile cf = pe.find(className);
+            ClassModel cf = pe.find(className);
             if (cf != null) {
                 return cf;
             }
@@ -113,7 +112,7 @@ interface PathEntry {
          * @param className the class to search for
          * @return a ClassFile instance, or null if not found
          */
-        ClassFile find(String className);
+        ClassModel find(String className);
     }
 
     /**
@@ -127,14 +126,14 @@ class JarPathEntry implements PathEntry {
         }
 
         @Override
-        public ClassFile find(String className) {
+        public ClassModel find(String className) {
             JarEntry entry = jarFile.getJarEntry(className + ".class");
             if (entry == null) {
                 return null;
             }
             try {
-                return ClassFile.read(jarFile.getInputStream(entry));
-            } catch (IOException | ConstantPoolException ex) {
+                return ClassFile.of().parse(jarFile.getInputStream(entry).readAllBytes());
+            } catch (IOException | IllegalArgumentException ex) {
                 if (verbose) {
                     ex.printStackTrace();
                 }
@@ -154,13 +153,13 @@ class DirPathEntry implements PathEntry {
         }
 
         @Override
-        public ClassFile find(String className) {
+        public ClassModel find(String className) {
             Path classFileName = dir.resolve(className + ".class");
             try {
-                return ClassFile.read(classFileName);
+                return ClassFile.of().parse(classFileName);
             } catch (NoSuchFileException nsfe) {
                 // not found, return silently
-            } catch (IOException | ConstantPoolException ex) {
+            } catch (IOException | IllegalArgumentException ex) {
                 if (verbose) {
                     ex.printStackTrace();
                 }
@@ -181,7 +180,7 @@ class JrtPathEntry implements PathEntry {
         final FileSystem fs = FileSystems.getFileSystem(URI.create("jrt:/"));
 
         @Override
-        public ClassFile find(String className) {
+        public ClassModel find(String className) {
             int end = className.lastIndexOf('/');
             if (end < 0) {
                 return null;
@@ -194,13 +193,13 @@ public ClassFile find(String className) {
                         .filter(Files::exists)
                         .findFirst();
                 if (opath.isPresent()) {
-                    return ClassFile.read(opath.get());
+                    return ClassFile.of().parse(opath.get());
                 } else {
                     return null;
                 }
             } catch (NoSuchFileException nsfe) {
                 // not found, return silently
-            } catch (IOException | ConstantPoolException ex) {
+            } catch (IOException | IllegalArgumentException ex) {
                 if (verbose) {
                     ex.printStackTrace();
                 }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/MethodSig.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/MethodSig.java
deleted file mode 100644
index 723b489f727..00000000000
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/MethodSig.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.jdeprscan.scan;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Represents a method's signature, that is, its parameter types
- * and its return type.
- */
-public class MethodSig {
-    final List<String> parameters;
-    final String returnType;
-
-    /**
-     * Parses the method descriptor and returns a MethodSig instance.
-     *
-     * @param desc the descriptor to parse
-     * @return the new MethodSig instance
-     */
-    public static MethodSig fromDesc(String desc) {
-        return parse(desc, 0, desc.length());
-    }
-
-    /**
-     * Returns this method's return type.
-     *
-     * @return the return type
-     */
-    public String getReturnType() {
-        return returnType;
-    }
-
-    /**
-     * Returns a list of parameters of this method.
-     *
-     * @return the parameter list
-     */
-    public List<String> getParameters() {
-        return parameters;
-    }
-
-    /**
-     * Returns a string describing this method.
-     *
-     * @return the string description
-     */
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("parameters");
-        if (parameters.isEmpty()) {
-            sb.append(" none");
-        } else {
-            int i = 0;
-            for (String p : parameters) {
-                sb.append(String.format(" %d=%s", i++, p));
-            }
-        }
-        sb.append(String.format(" return %s", returnType));
-        return sb.toString();
-    }
-
-    private MethodSig(List<String> parameters, String returnType) {
-        this.parameters = Collections.unmodifiableList(parameters);
-        this.returnType = returnType;
-    }
-
-    private static IllegalArgumentException ex(String desc, int pos) {
-        return new IllegalArgumentException(String.format(
-            "illegal descriptor \"%s\" at position %d", desc, pos));
-    }
-
-    private static MethodSig parse(String desc, int start, int end)
-            throws IllegalArgumentException {
-        int p = start;
-        int dims = 0;
-        boolean inReturnType = false;
-        String returnType = null;
-        List<String> parameters = new ArrayList<>();
-
-        while (p < end) {
-            String type;
-            char ch;
-            switch (ch = desc.charAt(p)) {
-                case '(':
-                    p++;
-                    continue;
-
-                case ')':
-                    p++;
-                    inReturnType = true;
-                    continue;
-
-                case '[':
-                    p++;
-                    dims++;
-                    continue;
-
-                case 'B': // byte
-                case 'C': // char
-                case 'D': // double
-                case 'F': // float
-                case 'I': // int
-                case 'J': // long
-                case 'S': // short
-                case 'Z': // boolean
-                case 'V': // void
-                    type = Character.toString(ch);
-                    p++;
-                    break;
-
-                case 'L':
-                    int sep = desc.indexOf(';', p);
-                    if (sep == -1 || sep >= end)
-                        throw ex(desc, p);
-                    type = desc.substring(p, ++sep);
-                    p = sep;
-                    break;
-
-                default:
-                    throw ex(desc, p);
-            }
-
-            StringBuilder sb = new StringBuilder();
-            for ( ; dims > 0; dims-- )
-                sb.append("[");
-            sb.append(type);
-            if (inReturnType) {
-                returnType = sb.toString();
-            } else {
-                parameters.add(sb.toString());
-            }
-        }
-
-        if (returnType == null) {
-            throw ex(desc, end);
-        }
-
-        return new MethodSig(parameters, returnType);
-    }
-}
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/Scan.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/Scan.java
index 671c3a39e96..8f1a2b3f005 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/Scan.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/Scan.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,13 @@
 
 import java.io.IOException;
 import java.io.PrintStream;
+import java.lang.classfile.AccessFlags;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.constantpool.FieldRefEntry;
+import java.lang.classfile.constantpool.NameAndTypeEntry;
+import java.lang.constant.MethodTypeDesc;
+import java.lang.reflect.AccessFlag;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
@@ -41,17 +48,12 @@
 import java.util.jar.JarFile;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.sun.tools.classfile.*;
 import com.sun.tools.jdeprscan.DeprData;
 import com.sun.tools.jdeprscan.DeprDB;
 import com.sun.tools.jdeprscan.Messages;
 
-import static com.sun.tools.classfile.AccessFlags.*;
-import static com.sun.tools.classfile.ConstantPool.*;
-
 /**
  * An object that represents the scanning phase of deprecation usage checking.
  * Given a deprecation database, scans the targeted directory hierarchy, jar
@@ -85,7 +87,7 @@ public Scan(PrintStream out,
         // one, we should instead add a reference to the symbol file for that release instead
         // of the current image. The problems are a) it's unclear how to get from a release
         // to paths that reference the symbol files, as this might be internal to the file
-        // manager; and b) the symbol file includes .sig files, not class files, which ClassFile
+        // manager; and b) the symbol file includes .sig files, not class files, which ClassModel
         // might not be able to handle.
         f.addJrt();
 
@@ -164,13 +166,13 @@ String nameFromRefType(String refType) {
 
     Pattern refTypePattern = Pattern.compile("\\[+L(.*);");
 
-    String typeKind(ClassFile cf) {
-        AccessFlags flags = cf.access_flags;
-        if (flags.is(ACC_ENUM)) {
+    String typeKind(ClassModel cf) {
+        AccessFlags flags = cf.flags();
+        if (flags.has(AccessFlag.ENUM)) {
             return "enum";
-        } else if (flags.is(ACC_ANNOTATION)) {
+        } else if (flags.has(AccessFlag.ANNOTATION)) {
             return "@interface";
-        } else if (flags.is(ACC_INTERFACE)) {
+        } else if (flags.has(AccessFlag.INTERFACE)) {
             return "interface";
         } else {
             return "class";
@@ -181,44 +183,43 @@ String dep(boolean forRemoval) {
         return Messages.get(forRemoval ? "scan.dep.removal" : "scan.dep.normal");
     }
 
-    void printType(String key, ClassFile cf, String cname, boolean r)
-            throws ConstantPoolException {
-        out.println(Messages.get(key, typeKind(cf), cf.getName(), cname, dep(r)));
+    void printType(String key, ClassModel cf, String cname, boolean r) {
+        out.println(Messages.get(key, typeKind(cf), cf.thisClass().asInternalName(), cname, dep(r)));
     }
 
-    void printMethod(String key, ClassFile cf, String cname, String mname, String rtype,
-                     boolean r) throws ConstantPoolException {
-        out.println(Messages.get(key, typeKind(cf), cf.getName(), cname, mname, rtype, dep(r)));
+    void printMethod(String key, ClassModel cf, String cname, String mname, String rtype,
+                     boolean r)  {
+        out.println(Messages.get(key, typeKind(cf), cf.thisClass().asInternalName(), cname, mname, rtype, dep(r)));
     }
 
-    void printField(String key, ClassFile cf, String cname, String fname,
-                     boolean r) throws ConstantPoolException {
-        out.println(Messages.get(key, typeKind(cf), cf.getName(), cname, fname, dep(r)));
+    void printField(String key, ClassModel cf, String cname, String fname,
+                     boolean r)  {
+        out.println(Messages.get(key, typeKind(cf), cf.thisClass().asInternalName(), cname, fname, dep(r)));
     }
 
-    void printFieldType(String key, ClassFile cf, String cname, String fname, String type,
-                     boolean r) throws ConstantPoolException {
-        out.println(Messages.get(key, typeKind(cf), cf.getName(), cname, fname, type, dep(r)));
+    void printFieldType(String key, ClassModel cf, String cname, String fname, String type,
+                     boolean r)  {
+        out.println(Messages.get(key, typeKind(cf), cf.thisClass().asInternalName(), cname, fname, type, dep(r)));
     }
 
-    void printHasField(ClassFile cf, String fname, String type, boolean r)
-            throws ConstantPoolException {
-        out.println(Messages.get("scan.out.hasfield", typeKind(cf), cf.getName(), fname, type, dep(r)));
+    void printHasField(ClassModel cf, String fname, String type, boolean r)
+             {
+        out.println(Messages.get("scan.out.hasfield", typeKind(cf), cf.thisClass().asInternalName(), fname, type, dep(r)));
     }
 
-    void printHasMethodParmType(ClassFile cf, String mname, String parmType, boolean r)
-            throws ConstantPoolException {
-        out.println(Messages.get("scan.out.methodparmtype", typeKind(cf), cf.getName(), mname, parmType, dep(r)));
+    void printHasMethodParmType(ClassModel cf, String mname, String parmType, boolean r)
+             {
+        out.println(Messages.get("scan.out.methodparmtype", typeKind(cf), cf.thisClass().asInternalName(), mname, parmType, dep(r)));
     }
 
-    void printHasMethodRetType(ClassFile cf, String mname, String retType, boolean r)
-            throws ConstantPoolException {
-        out.println(Messages.get("scan.out.methodrettype", typeKind(cf), cf.getName(), mname, retType, dep(r)));
+    void printHasMethodRetType(ClassModel cf, String mname, String retType, boolean r)
+             {
+        out.println(Messages.get("scan.out.methodrettype", typeKind(cf), cf.thisClass().asInternalName(), mname, retType, dep(r)));
     }
 
-    void printHasOverriddenMethod(ClassFile cf, String overridden, String mname, String desc, boolean r)
-            throws ConstantPoolException {
-        out.println(Messages.get("scan.out.methodoverride", typeKind(cf), cf.getName(), overridden,
+    void printHasOverriddenMethod(ClassModel cf, String overridden, String mname, String desc, boolean r)
+             {
+        out.println(Messages.get("scan.out.methodoverride", typeKind(cf), cf.thisClass().asInternalName(), overridden,
                                  mname, desc, dep(r)));
     }
 
@@ -253,29 +254,29 @@ void errorNoMethod(String className, String methodName, String desc) {
      * The checkMethod parameter determines whether this checks for a method
      * or for a field.
      *
-     * @param targetClass the ClassFile of the class to search
+     * @param targetClass the ClassModel of the class to search
      * @param targetName the method or field's name
      * @param targetDesc the methods descriptor (ignored if checkMethod is false)
      * @param checkMethod true if checking for method, false if checking for field
      * @return boolean indicating whether the member is present
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @ if a constant pool entry cannot be found
      */
-    boolean isMemberPresent(ClassFile targetClass,
+    boolean isMemberPresent(ClassModel targetClass,
                             String targetName,
                             String targetDesc,
                             boolean checkMethod)
-            throws ConstantPoolException {
+             {
         if (checkMethod) {
-            for (Method m : targetClass.methods) {
-                String mname = m.getName(targetClass.constant_pool);
-                String mdesc = targetClass.constant_pool.getUTF8Value(m.descriptor.index);
+            for (var m : targetClass.methods()) {
+                String mname = m.methodName().stringValue();
+                String mdesc = m.methodType().stringValue();
                 if (targetName.equals(mname) && targetDesc.equals(mdesc)) {
                     return true;
                 }
             }
         } else {
-            for (Field f : targetClass.fields) {
-                String fname = f.getName(targetClass.constant_pool);
+            for (var f : targetClass.fields()) {
+                String fname = f.fieldName().stringValue();
                 if (targetName.equals(fname)) {
                     return true;
                 }
@@ -288,14 +289,12 @@ boolean isMemberPresent(ClassFile targetClass,
      * Adds all interfaces from this class to the deque of interfaces.
      *
      * @param intfs the deque of interfaces
-     * @param cf the ClassFile of this class
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @param cf the ClassModel of this class
+     * @ if a constant pool entry cannot be found
      */
-    void addInterfaces(Deque<String> intfs, ClassFile cf)
-            throws ConstantPoolException {
-        int count = cf.interfaces.length;
-        for (int i = 0; i < count; i++) {
-            intfs.addLast(cf.getInterfaceName(i));
+    void addInterfaces(Deque<String> intfs, ClassModel cf) {
+        for (var itf : cf.interfaces()) {
+            intfs.addLast(itf.asInternalName());
         }
     }
 
@@ -307,7 +306,7 @@ void addInterfaces(Deque<String> intfs, ClassFile cf)
      *
      * TODO: refine error handling
      *
-     * @param cf the ClassFile of this class
+     * @param cf the ClassModel of this class
      * @param startClassName the name of the class at which to start searching
      * @param findName the member name to search for
      * @param findDesc the method descriptor to search for (ignored for fields)
@@ -315,15 +314,15 @@ void addInterfaces(Deque<String> intfs, ClassFile cf)
      * @param checkStartClass true if the start class should be searched, false if
      *                        it should be skipped
      * @return the name of the class where the member resolved, or null
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @ if a constant pool entry cannot be found
      */
     String resolveMember(
-            ClassFile cf, String startClassName, String findName, String findDesc,
+            ClassModel cf, String startClassName, String findName, String findDesc,
             boolean resolveMethod, boolean checkStartClass)
-            throws ConstantPoolException {
-        ClassFile startClass;
+             {
+        ClassModel startClass;
 
-        if (cf.getName().equals(startClassName)) {
+        if (cf.thisClass().asInternalName().equals(startClassName)) {
             startClass = cf;
         } else {
             startClass = finder.find(startClassName);
@@ -336,7 +335,7 @@ String resolveMember(
         // follow super_class until it's 0, meaning we've reached Object
         // accumulate interfaces of superclasses as we go along
 
-        ClassFile curClass = startClass;
+        ClassModel curClass = startClass;
         Deque<String> intfs = new ArrayDeque<>();
         while (true) {
             if ((checkStartClass || curClass != startClass) &&
@@ -344,12 +343,13 @@ String resolveMember(
                 break;
             }
 
-            if (curClass.super_class == 0) { // reached Object
+            var superclass = curClass.superclass();
+            if (superclass.isEmpty()) { // reached Object
                 curClass = null;
                 break;
             }
 
-            String superName = curClass.getSuperclassName();
+            String superName = superclass.get().asInternalName();
             curClass = finder.find(superName);
             if (curClass == null) {
                 errorNoClass(superName);
@@ -391,7 +391,7 @@ String resolveMember(
                 return null;
             }
         } else {
-            String foundClassName = curClass.getName();
+            String foundClassName = curClass.thisClass().asInternalName();
             return foundClassName;
         }
     }
@@ -399,11 +399,15 @@ String resolveMember(
     /**
      * Checks the superclass of this class.
      *
-     * @param cf the ClassFile of this class
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @param cf the ClassModel of this class
+     * @ if a constant pool entry cannot be found
      */
-    void checkSuper(ClassFile cf) throws ConstantPoolException {
-        String sname = cf.getSuperclassName();
+    void checkSuper(ClassModel cf)  {
+        var superclass = cf.superclass();
+        if (superclass.isEmpty()) {
+            return;
+        }
+        String sname = superclass.get().asInternalName();
         DeprData dd = db.getTypeDeprecated(sname);
         if (dd != null) {
             printType("scan.out.extends", cf, sname, dd.isForRemoval());
@@ -413,13 +417,12 @@ void checkSuper(ClassFile cf) throws ConstantPoolException {
     /**
      * Checks the interfaces of this class.
      *
-     * @param cf the ClassFile of this class
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @param cf the ClassModel of this class
+     * @ if a constant pool entry cannot be found
      */
-    void checkInterfaces(ClassFile cf) throws ConstantPoolException {
-        int ni = cf.interfaces.length;
-        for (int i = 0; i < ni; i++) {
-            String iname = cf.getInterfaceName(i);
+    void checkInterfaces(ClassModel cf)  {
+        for (var itf : cf.interfaces()) {
+            String iname = itf.asInternalName();
             DeprData dd = db.getTypeDeprecated(iname);
             if (dd != null) {
                 printType("scan.out.implements", cf, iname, dd.isForRemoval());
@@ -430,13 +433,13 @@ void checkInterfaces(ClassFile cf) throws ConstantPoolException {
     /**
      * Checks Class_info entries in the constant pool.
      *
-     * @param cf the ClassFile of this class
+     * @param cf the ClassModel of this class
      * @param entries constant pool entries collected from this class
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @ if a constant pool entry cannot be found
      */
-    void checkClasses(ClassFile cf, CPEntries entries) throws ConstantPoolException {
-        for (ConstantPool.CONSTANT_Class_info ci : entries.classes) {
-            String name = nameFromRefType(ci.getName());
+    void checkClasses(ClassModel cf, CPEntries entries)  {
+        for (var ci : entries.classes) {
+            String name = nameFromRefType(ci.asInternalName());
             if (name != null) {
                 DeprData dd = db.getTypeDeprecated(name);
                 if (dd != null) {
@@ -449,18 +452,18 @@ void checkClasses(ClassFile cf, CPEntries entries) throws ConstantPoolException
     /**
      * Checks methods referred to from the constant pool.
      *
-     * @param cf the ClassFile of this class
+     * @param cf the ClassModel of this class
      * @param clname the class name
      * @param nti the NameAndType_info from a MethodRef or InterfaceMethodRef entry
      * @param msgKey message key for localization
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @ if a constant pool entry cannot be found
      */
-    void checkMethodRef(ClassFile cf,
+    void checkMethodRef(ClassModel cf,
                         String clname,
-                        CONSTANT_NameAndType_info nti,
-                        String msgKey) throws ConstantPoolException {
-        String name = nti.getName();
-        String type = nti.getType();
+                        NameAndTypeEntry nti,
+                        String msgKey)  {
+        String name = nti.name().stringValue();
+        String type = nti.type().stringValue();
         clname = nameFromRefType(clname);
         if (clname != null) {
             clname = resolveMember(cf, clname, name, type, true, true);
@@ -474,15 +477,15 @@ void checkMethodRef(ClassFile cf,
     /**
      * Checks fields referred to from the constant pool.
      *
-     * @param cf the ClassFile of this class
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @param cf the ClassModel of this class
+     * @ if a constant pool entry cannot be found
      */
-    void checkFieldRef(ClassFile cf,
-                       ConstantPool.CONSTANT_Fieldref_info fri) throws ConstantPoolException {
-        String clname = nameFromRefType(fri.getClassName());
-        CONSTANT_NameAndType_info nti = fri.getNameAndTypeInfo();
-        String name = nti.getName();
-        String type = nti.getType();
+    void checkFieldRef(ClassModel cf,
+                       FieldRefEntry fri)  {
+        String clname = nameFromRefType(fri.owner().asInternalName());
+        var nti = fri.nameAndType();
+        String name = nti.name().stringValue();
+        String type = nti.type().stringValue();
 
         if (clname != null) {
             clname = resolveMember(cf, clname, name, type, false, true);
@@ -496,16 +499,16 @@ void checkFieldRef(ClassFile cf,
     /**
      * Checks the fields declared in this class.
      *
-     * @param cf the ClassFile of this class
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @param cf the ClassModel of this class
+     * @ if a constant pool entry cannot be found
      */
-    void checkFields(ClassFile cf) throws ConstantPoolException {
-        for (Field f : cf.fields) {
-            String type = nameFromDescType(cf.constant_pool.getUTF8Value(f.descriptor.index));
+    void checkFields(ClassModel cf)  {
+        for (var f : cf.fields()) {
+            String type = nameFromDescType(f.fieldType().stringValue());
             if (type != null) {
                 DeprData dd = db.getTypeDeprecated(type);
                 if (dd != null) {
-                    printHasField(cf, f.getName(cf.constant_pool), type, dd.isForRemoval());
+                    printHasField(cf, f.fieldName().stringValue(), type, dd.isForRemoval());
                 }
             }
         }
@@ -514,17 +517,18 @@ void checkFields(ClassFile cf) throws ConstantPoolException {
     /**
      * Checks the methods declared in this class.
      *
-     * @param cf the ClassFile object of this class
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @param cf the ClassModel object of this class
+     * @ if a constant pool entry cannot be found
      */
-    void checkMethods(ClassFile cf) throws ConstantPoolException {
-        for (Method m : cf.methods) {
-            String mname = m.getName(cf.constant_pool);
-            String desc = cf.constant_pool.getUTF8Value(m.descriptor.index);
-            MethodSig sig = MethodSig.fromDesc(desc);
+    void checkMethods(ClassModel cf)  {
+        for (var m : cf.methods()) {
+            String mname = m.methodName().stringValue();
+            var desc = m.methodType().stringValue();
+            MethodTypeDesc sig = m.methodTypeSymbol();
             DeprData dd;
 
-            for (String parm : sig.getParameters()) {
+            for (var parmDesc : sig.parameterArray()) {
+                var parm = parmDesc.descriptorString();
                 parm = nameFromDescType(parm);
                 if (parm != null) {
                     dd = db.getTypeDeprecated(parm);
@@ -534,7 +538,7 @@ void checkMethods(ClassFile cf) throws ConstantPoolException {
                 }
             }
 
-            String ret = nameFromDescType(sig.getReturnType());
+            String ret = nameFromDescType(sig.returnType().descriptorString());
             if (ret != null) {
                 dd = db.getTypeDeprecated(ret);
                 if (dd != null) {
@@ -543,7 +547,7 @@ void checkMethods(ClassFile cf) throws ConstantPoolException {
             }
 
             // check overrides
-            String overridden = resolveMember(cf, cf.getName(), mname, desc, true, false);
+            String overridden = resolveMember(cf, cf.thisClass().asInternalName(), mname, desc, true, false);
             if (overridden != null) {
                 dd = db.getMethodDeprecated(overridden, mname, desc);
                 if (dd != null) {
@@ -556,12 +560,12 @@ void checkMethods(ClassFile cf) throws ConstantPoolException {
     /**
      * Processes a single class file.
      *
-     * @param cf the ClassFile of the class
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @param cf the ClassModel of the class
+     * @ if a constant pool entry cannot be found
      */
-    void processClass(ClassFile cf) throws ConstantPoolException {
+    void processClass(ClassModel cf)  {
         if (verbose) {
-            out.println(Messages.get("scan.process.class", cf.getName()));
+            out.println(Messages.get("scan.process.class", cf.thisClass().asInternalName()));
         }
 
         CPEntries entries = CPEntries.loadFrom(cf);
@@ -570,19 +574,19 @@ void processClass(ClassFile cf) throws ConstantPoolException {
         checkInterfaces(cf);
         checkClasses(cf, entries);
 
-        for (ConstantPool.CONSTANT_Methodref_info mri : entries.methodRefs) {
-            String clname = mri.getClassName();
-            CONSTANT_NameAndType_info nti = mri.getNameAndTypeInfo();
+        for (var mri : entries.methodRefs) {
+            String clname = mri.owner().asInternalName();
+            var nti = mri.nameAndType();
             checkMethodRef(cf, clname, nti, "scan.out.usesmethod");
         }
 
-        for (ConstantPool.CONSTANT_InterfaceMethodref_info imri : entries.intfMethodRefs) {
-            String clname = imri.getClassName();
-            CONSTANT_NameAndType_info nti = imri.getNameAndTypeInfo();
+        for (var imri : entries.intfMethodRefs) {
+            String clname = imri.owner().asInternalName();
+            var nti = imri.nameAndType();
             checkMethodRef(cf, clname, nti, "scan.out.usesintfmethod");
         }
 
-        for (ConstantPool.CONSTANT_Fieldref_info fri : entries.fieldRefs) {
+        for (var fri : entries.fieldRefs) {
             checkFieldRef(cf, fri);
         }
 
@@ -607,13 +611,14 @@ public boolean scanJar(String jarname) {
                 if (name.endsWith(".class")
                         && !name.endsWith("package-info.class")
                         && !name.endsWith("module-info.class")) {
-                    processClass(ClassFile.read(jf.getInputStream(entry)));
+                    processClass(ClassFile.of().parse(jf
+                            .getInputStream(entry).readAllBytes()));
                 }
             }
             return true;
         } catch (NoSuchFileException nsfe) {
             errorNoFile(jarname);
-        } catch (IOException | ConstantPoolException ex) {
+        } catch (IOException | IllegalArgumentException ex) {
             errorException(ex);
         }
         return false;
@@ -640,10 +645,10 @@ public boolean scanDir(String dirname) {
             out.println(Messages.get("scan.head.dir", dirname));
 
             for (Path p : classes) {
-                processClass(ClassFile.read(p));
+                processClass(ClassFile.of().parse(p));
             }
             return true;
-        } catch (IOException | ConstantPoolException ex) {
+        } catch (IOException | IllegalArgumentException ex) {
             errorException(ex);
             return false;
         }
@@ -657,7 +662,7 @@ public boolean scanDir(String dirname) {
      */
     public boolean processClassName(String className) {
         try {
-            ClassFile cf = finder.find(className);
+            ClassModel cf = finder.find(className);
             if (cf == null) {
                 errorNoClass(className);
                 return false;
@@ -665,7 +670,7 @@ public boolean processClassName(String className) {
                 processClass(cf);
                 return true;
             }
-        } catch (ConstantPoolException ex) {
+        } catch (IllegalArgumentException ex) {
             errorException(ex);
             return false;
         }
@@ -680,12 +685,12 @@ public boolean processClassName(String className) {
     public boolean processClassFile(String fileName) {
         Path path = Paths.get(fileName);
         try {
-            ClassFile cf = ClassFile.read(path);
+            ClassModel cf = ClassFile.of().parse(path);
             processClass(cf);
             return true;
         } catch (NoSuchFileException nsfe) {
             errorNoFile(fileName);
-        } catch (IOException | ConstantPoolException ex) {
+        } catch (IOException | IllegalArgumentException ex) {
             errorException(ex);
         }
         return false;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java
index 6e83e2196b7..22377715a1e 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package com.sun.tools.jdeps;
 
-import com.sun.tools.classfile.Dependency.Location;
+import com.sun.tools.jdeps.Dependency.Location;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Archive.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Archive.java
index 796681f1c3d..f9720a268cd 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Archive.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Archive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package com.sun.tools.jdeps;
 
-import com.sun.tools.classfile.Dependency.Location;
+import com.sun.tools.jdeps.Dependency.Location;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java
index b03c175da24..fc1bf5302d6 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,7 @@
 
 package com.sun.tools.jdeps;
 
-import com.sun.tools.classfile.AccessFlags;
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.Dependencies.ClassFileError;
+import com.sun.tools.jdeps.Dependencies.ClassFileError;
 
 import java.io.Closeable;
 import java.io.File;
@@ -36,13 +33,14 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -54,7 +52,7 @@
 import java.util.zip.ZipFile;
 
 /**
- * ClassFileReader reads ClassFile(s) of a given path that can be
+ * ClassFileReader reads ClassModel(s) of a given path that can be
  * a .class file, a directory, or a JAR file.
  */
 public class ClassFileReader implements Closeable {
@@ -117,10 +115,10 @@ public Set<String> entries() {
     }
 
     /**
-     * Returns the ClassFile matching the given binary name
+     * Returns the ClassModel matching the given binary name
      * or a fully-qualified class name.
      */
-    public ClassFile getClassFile(String name) throws IOException {
+    public ClassModel getClassFile(String name) throws IOException {
         if (name.indexOf('.') > 0) {
             int i = name.lastIndexOf('.');
             String pathname = name.replace('.', File.separatorChar) + ".class";
@@ -137,31 +135,25 @@ public ClassFile getClassFile(String name) throws IOException {
         return null;
     }
 
-    public Iterable<ClassFile> getClassFiles() throws IOException {
+    public Iterable<ClassModel> getClassFiles() throws IOException {
         return FileIterator::new;
     }
 
-    protected ClassFile readClassFile(Path p) throws IOException {
-        InputStream is = null;
+    protected ClassModel readClassFile(Path p) throws IOException {
         try {
-            is = Files.newInputStream(p);
-            return ClassFile.read(is);
-        } catch (ConstantPoolException e) {
+            return ClassFile.of().parse(p);
+        } catch (IllegalArgumentException e) {
             throw new ClassFileError(e);
-        } finally {
-            if (is != null) {
-                is.close();
-            }
         }
     }
 
     protected Set<String> scan() {
         try {
-            ClassFile cf = ClassFile.read(path);
-            String name = cf.access_flags.is(AccessFlags.ACC_MODULE)
-                ? "module-info" : cf.getName();
+            ClassModel cf = ClassFile.of().parse(path);
+            String name = cf.isModuleInfo()
+                ? "module-info" : cf.thisClass().asInternalName();
             return Collections.singleton(name);
-        } catch (ConstantPoolException|IOException e) {
+        } catch (IllegalArgumentException|IOException e) {
             throw new ClassFileError(e);
         }
     }
@@ -175,7 +167,7 @@ static boolean isClass(Path file) {
     public void close() throws IOException {
     }
 
-    class FileIterator implements Iterator<ClassFile> {
+    class FileIterator implements Iterator<ClassModel> {
         int count;
         FileIterator() {
             this.count = 0;
@@ -184,12 +176,12 @@ public boolean hasNext() {
             return count == 0 && baseFileName.endsWith(".class");
         }
 
-        public ClassFile next() {
+        public ClassModel next() {
             if (!hasNext()) {
                 throw new NoSuchElementException();
             }
             try {
-                ClassFile cf = readClassFile(path);
+                ClassModel cf = readClassFile(path);
                 count++;
                 return cf;
             } catch (IOException e) {
@@ -228,7 +220,7 @@ protected Set<String> scan() {
             }
         }
 
-        public ClassFile getClassFile(String name) throws IOException {
+        public ClassModel getClassFile(String name) throws IOException {
             if (name.indexOf('.') > 0) {
                 int i = name.lastIndexOf('.');
                 String pathname = name.replace(".", fsSep) + ".class";
@@ -249,12 +241,12 @@ public ClassFile getClassFile(String name) throws IOException {
             return null;
         }
 
-        public Iterable<ClassFile> getClassFiles() throws IOException {
-            final Iterator<ClassFile> iter = new DirectoryIterator();
+        public Iterable<ClassModel> getClassFiles() throws IOException {
+            final Iterator<ClassModel> iter = new DirectoryIterator();
             return () -> iter;
         }
 
-        class DirectoryIterator implements Iterator<ClassFile> {
+        class DirectoryIterator implements Iterator<ClassModel> {
             private final List<Path> entries;
             private int index = 0;
             DirectoryIterator() throws IOException {
@@ -271,7 +263,7 @@ public boolean hasNext() {
                 return index != entries.size();
             }
 
-            public ClassFile next() {
+            public ClassModel next() {
                 if (!hasNext()) {
                     throw new NoSuchElementException();
                 }
@@ -332,7 +324,7 @@ protected Set<String> scan() {
             }
         }
 
-        public ClassFile getClassFile(String name) throws IOException {
+        public ClassModel getClassFile(String name) throws IOException {
             if (name.indexOf('.') > 0) {
                 int i = name.lastIndexOf('.');
                 String entryName = name.replace('.', '/') + ".class";
@@ -353,31 +345,31 @@ public ClassFile getClassFile(String name) throws IOException {
             return null;
         }
 
-        protected ClassFile readClassFile(JarFile jarfile, JarEntry e) throws IOException {
+        protected ClassModel readClassFile(JarFile jarfile, JarEntry e) throws IOException {
             try (InputStream is = jarfile.getInputStream(e)) {
-                ClassFile cf = ClassFile.read(is);
+                ClassModel cf = ClassFile.of().parse(is.readAllBytes());
                 // exclude module-info.class since this jarFile is on classpath
-                if (jarfile.isMultiRelease() && !cf.getName().equals("module-info")) {
+                if (jarfile.isMultiRelease() && !cf.isModuleInfo()) {
                     VersionHelper.add(jarfile, e, cf);
                 }
                 return cf;
-            } catch (ConstantPoolException ex) {
+            } catch (IllegalArgumentException ex) {
                 throw new ClassFileError(ex);
             }
         }
 
-        public Iterable<ClassFile> getClassFiles() throws IOException {
-            final Iterator<ClassFile> iter = new JarFileIterator(this, jarfile);
+        public Iterable<ClassModel> getClassFiles() throws IOException {
+            final Iterator<ClassModel> iter = new JarFileIterator(this, jarfile);
             return () -> iter;
         }
     }
 
-    class JarFileIterator implements Iterator<ClassFile> {
+    class JarFileIterator implements Iterator<ClassModel> {
         protected final JarFileReader reader;
         protected Iterator<JarEntry> entries;
         protected JarFile jf;
         protected JarEntry nextEntry;
-        protected ClassFile cf;
+        protected ClassModel cf;
         JarFileIterator(JarFileReader reader) {
             this(reader, null);
         }
@@ -413,11 +405,11 @@ public boolean hasNext() {
             return false;
         }
 
-        public ClassFile next() {
+        public ClassModel next() {
             if (!hasNext()) {
                 throw new NoSuchElementException();
             }
-            ClassFile classFile = cf;
+            ClassModel classFile = cf;
             cf = null;
             nextEntry = nextEntry();
             return classFile;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Dependencies.java
similarity index 62%
rename from src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java
rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Dependencies.java
index aeb479646ef..422845150f0 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Dependencies.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,31 +23,20 @@
  * questions.
  */
 
-package com.sun.tools.classfile;
+package com.sun.tools.jdeps;
 
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.lang.classfile.*;
+import java.lang.classfile.constantpool.*;
+import java.lang.constant.ClassDesc;
+import java.lang.constant.MethodTypeDesc;
+import java.lang.reflect.AccessFlag;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 
-import com.sun.tools.classfile.Dependency.Filter;
-import com.sun.tools.classfile.Dependency.Finder;
-import com.sun.tools.classfile.Dependency.Location;
-import com.sun.tools.classfile.Type.ArrayType;
-import com.sun.tools.classfile.Type.ClassSigType;
-import com.sun.tools.classfile.Type.ClassType;
-import com.sun.tools.classfile.Type.MethodType;
-import com.sun.tools.classfile.Type.SimpleType;
-import com.sun.tools.classfile.Type.TypeParamType;
-import com.sun.tools.classfile.Type.WildcardType;
-
-import static com.sun.tools.classfile.ConstantPool.*;
+import com.sun.tools.jdeps.Dependency.Filter;
+import com.sun.tools.jdeps.Dependency.Finder;
+import com.sun.tools.jdeps.Dependency.Location;
 
 /**
  * A framework for determining {@link Dependency dependencies} between class files.
@@ -107,7 +96,7 @@ public interface ClassFileReader {
          * @throws Dependencies.ClassFileNotFoundException if the classfile cannot be
          *   found
          */
-        public ClassFile getClassFile(String className)
+        public ClassModel getClassFile(String className)
                 throws ClassFileNotFoundException;
     }
 
@@ -127,7 +116,7 @@ public interface Recorder {
      * @return the default finder
      */
     public static Finder getDefaultFinder() {
-        return new APIDependencyFinder(AccessFlags.ACC_PRIVATE);
+        return new APIDependencyFinder(ClassFile.ACC_PRIVATE);
     }
 
     /**
@@ -135,9 +124,9 @@ public static Finder getDefaultFinder() {
      * These include the superclass, superinterfaces, and classes referenced in
      * the declarations of fields and methods.  The fields and methods that
      * are checked can be limited according to a specified access.
-     * The access parameter must be one of {@link AccessFlags#ACC_PUBLIC ACC_PUBLIC},
-     * {@link AccessFlags#ACC_PRIVATE ACC_PRIVATE},
-     * {@link AccessFlags#ACC_PROTECTED ACC_PROTECTED}, or 0 for
+     * The access parameter must be one of {@link ClassFile#ACC_PUBLIC ACC_PUBLIC},
+     * {@link ClassFile#ACC_PRIVATE ACC_PRIVATE},
+     * {@link ClassFile#ACC_PROTECTED ACC_PROTECTED}, or 0 for
      * package private access. Members with greater than or equal accessibility
      * to that specified will be searched for dependencies.
      * @param access the access of members to be checked
@@ -291,7 +280,7 @@ public void findAllDependencies(
             assert (!doneClasses.contains(className));
             doneClasses.add(className);
 
-            ClassFile cf = classFinder.getClassFile(className);
+            ClassModel cf = classFinder.getClassFile(className);
 
             // The following code just applies the filter to the dependencies
             // followed for the transitive closure.
@@ -466,28 +455,25 @@ public boolean accepts(Dependency dependency) {
      * This class identifies class names directly or indirectly in the constant pool.
      */
     static class ClassDependencyFinder extends BasicDependencyFinder {
-        public Iterable<? extends Dependency> findDependencies(ClassFile classfile) {
+        public Iterable<? extends Dependency> findDependencies(ClassModel classfile) {
             Visitor v = new Visitor(classfile);
-            for (CPInfo cpInfo: classfile.constant_pool.entries()) {
+            for (var cpInfo: classfile.constantPool()) {
                 v.scan(cpInfo);
             }
             try {
-                v.addClass(classfile.super_class);
-                v.addClasses(classfile.interfaces);
-                v.scan(classfile.attributes);
+                classfile.superclass().ifPresent(v::addClass);
+                v.addClasses(classfile.interfaces());
+                v.scanAttributes(classfile);
 
-                for (Field f : classfile.fields) {
-                    v.scan(f.descriptor, f.attributes);
+                for (var f : classfile.fields()) {
+                    v.scan(f.fieldTypeSymbol());
+                    v.scanAttributes(f);
                 }
-                for (Method m : classfile.methods) {
-                    v.scan(m.descriptor, m.attributes);
-                    Exceptions_attribute e =
-                        (Exceptions_attribute)m.attributes.get(Attribute.Exceptions);
-                    if (e != null) {
-                        v.addClasses(e.exception_index_table);
-                    }
+                for (var m : classfile.methods()) {
+                    v.scan(m.methodTypeSymbol());
+                    v.scanAttributes(m);
                 }
-            } catch (ConstantPoolException e) {
+            } catch (IllegalArgumentException e) {
                 throw new ClassFileError(e);
             }
 
@@ -502,9 +488,9 @@ public Iterable<? extends Dependency> findDependencies(ClassFile classfile) {
     static class APIDependencyFinder extends BasicDependencyFinder {
         APIDependencyFinder(int access) {
             switch (access) {
-                case AccessFlags.ACC_PUBLIC:
-                case AccessFlags.ACC_PROTECTED:
-                case AccessFlags.ACC_PRIVATE:
+                case ClassFile.ACC_PUBLIC:
+                case ClassFile.ACC_PROTECTED:
+                case ClassFile.ACC_PRIVATE:
                 case 0:
                     showAccess = access;
                     break;
@@ -514,41 +500,40 @@ static class APIDependencyFinder extends BasicDependencyFinder {
             }
         }
 
-        public Iterable<? extends Dependency> findDependencies(ClassFile classfile) {
+        public Iterable<? extends Dependency> findDependencies(ClassModel classfile) {
             try {
                 Visitor v = new Visitor(classfile);
-                v.addClass(classfile.super_class);
-                v.addClasses(classfile.interfaces);
+                classfile.superclass().ifPresent(v::addClass);
+                v.addClasses(classfile.interfaces());
                 // inner classes?
-                for (Field f : classfile.fields) {
-                    if (checkAccess(f.access_flags))
-                        v.scan(f.descriptor, f.attributes);
+                for (var f : classfile.fields()) {
+                    if (checkAccess(f.flags())) {
+                        v.scan(f.fieldTypeSymbol());
+                        v.scanAttributes(f);
+                    }
                 }
-                for (Method m : classfile.methods) {
-                    if (checkAccess(m.access_flags)) {
-                        v.scan(m.descriptor, m.attributes);
-                        Exceptions_attribute e =
-                                (Exceptions_attribute) m.attributes.get(Attribute.Exceptions);
-                        if (e != null)
-                            v.addClasses(e.exception_index_table);
+                for (var m : classfile.methods()) {
+                    if (checkAccess(m.flags())) {
+                        v.scan(m.methodTypeSymbol());
+                        v.scanAttributes(m);
                     }
                 }
                 return v.deps;
-            } catch (ConstantPoolException e) {
+            } catch (IllegalArgumentException e) {
                 throw new ClassFileError(e);
             }
         }
 
         boolean checkAccess(AccessFlags flags) {
             // code copied from javap.Options.checkAccess
-            boolean isPublic = flags.is(AccessFlags.ACC_PUBLIC);
-            boolean isProtected = flags.is(AccessFlags.ACC_PROTECTED);
-            boolean isPrivate = flags.is(AccessFlags.ACC_PRIVATE);
+            boolean isPublic = flags.has(AccessFlag.PUBLIC);
+            boolean isProtected = flags.has(AccessFlag.PROTECTED);
+            boolean isPrivate = flags.has(AccessFlag.PRIVATE);
             boolean isPackage = !(isPublic || isProtected || isPrivate);
 
-            if ((showAccess == AccessFlags.ACC_PUBLIC) && (isProtected || isPrivate || isPackage))
+            if ((showAccess == ClassFile.ACC_PUBLIC) && (isProtected || isPrivate || isPackage))
                 return false;
-            else if ((showAccess == AccessFlags.ACC_PROTECTED) && (isPrivate || isPackage))
+            else if ((showAccess == ClassFile.ACC_PROTECTED) && (isPrivate || isPackage))
                 return false;
             else if ((showAccess == 0) && (isPrivate))
                 return false;
@@ -566,238 +551,158 @@ Location getLocation(String className) {
             return locations.computeIfAbsent(className, SimpleLocation::new);
         }
 
-        class Visitor implements ConstantPool.Visitor<Void,Void>, Type.Visitor<Void, Void> {
-            private ConstantPool constant_pool;
-            private Location origin;
-            Set<Dependency> deps;
-
-            Visitor(ClassFile classFile) {
-                try {
-                    constant_pool = classFile.constant_pool;
-                    origin = getLocation(classFile.getName());
-                    deps = new HashSet<>();
-                } catch (ConstantPoolException e) {
-                    throw new ClassFileError(e);
-                }
-            }
+        class Visitor {
+            private final Location origin;
+            final Set<Dependency> deps;
 
-            void scan(Descriptor d, Attributes attrs) {
+            Visitor(ClassModel classFile) {
                 try {
-                    scan(new Signature(d.index).getType(constant_pool));
-                    scan(attrs);
-                } catch (ConstantPoolException e) {
+                    origin = getLocation(classFile.thisClass().asInternalName());
+                } catch (IllegalArgumentException e) {
                     throw new ClassFileError(e);
                 }
+                deps = new HashSet<>();
             }
 
-            void scan(CPInfo cpInfo) {
-                cpInfo.accept(this, null);
+            private void addDependency(String internalName) {
+                deps.add(new SimpleDependency(origin, getLocation(internalName)));
             }
 
-            void scan(Type t) {
-                t.accept(this, null);
+            private void addClass(ClassEntry ce) throws IllegalArgumentException {
+                assert ce.name().charAt(0) != '[';
+                addDependency(ce.asInternalName());
             }
 
-            void scan(Attributes attrs) {
-                try {
-                    Signature_attribute sa = (Signature_attribute)attrs.get(Attribute.Signature);
-                    if (sa != null)
-                        scan(sa.getParsedSignature().getType(constant_pool));
-
-                    scan((RuntimeVisibleAnnotations_attribute)
-                            attrs.get(Attribute.RuntimeVisibleAnnotations));
-                    scan((RuntimeVisibleParameterAnnotations_attribute)
-                            attrs.get(Attribute.RuntimeVisibleParameterAnnotations));
-                } catch (ConstantPoolException e) {
-                    throw new ClassFileError(e);
-                }
-            }
-
-            private void scan(RuntimeAnnotations_attribute attr) throws ConstantPoolException {
-                if (attr == null) {
-                    return;
-                }
-                for (int i = 0; i < attr.annotations.length; i++) {
-                    int index = attr.annotations[i].type_index;
-                    scan(new Signature(index).getType(constant_pool));
-                }
+            private void addClasses(Collection<? extends ClassEntry> ces) throws IllegalArgumentException {
+                for (var i: ces)
+                    addClass(i);
             }
 
-            private void scan(RuntimeParameterAnnotations_attribute attr) throws ConstantPoolException {
-                if (attr == null) {
-                    return;
+            private void scan(ClassDesc cd) {
+                while (cd.isArray()) {
+                    cd = cd.componentType();
                 }
-                for (int param = 0; param < attr.parameter_annotations.length; param++) {
-                    for (int i = 0; i < attr.parameter_annotations[param].length; i++) {
-                        int index = attr.parameter_annotations[param][i].type_index;
-                        scan(new Signature(index).getType(constant_pool));
-                    }
+                if (cd.isClassOrInterface()) {
+                    var desc = cd.descriptorString();
+                    addDependency(desc.substring(1, desc.length() - 1));
                 }
             }
 
-            void addClass(int index) throws ConstantPoolException {
-                if (index != 0) {
-                    String name = constant_pool.getClassInfo(index).getBaseName();
-                    if (name != null)
-                        addDependency(name);
+            private void scan(MethodTypeDesc mtd) {
+                scan(mtd.returnType());
+                for (int i = 0; i < mtd.parameterCount(); i++) {
+                    scan(mtd.parameterType(i));
                 }
             }
 
-            void addClasses(int[] indices) throws ConstantPoolException {
-                for (int i: indices)
-                    addClass(i);
-            }
-
-            private void addDependency(String name) {
-                deps.add(new SimpleDependency(origin, getLocation(name)));
-            }
-
-            // ConstantPool.Visitor methods
-
-            public Void visitClass(CONSTANT_Class_info info, Void p) {
+            void scanAttributes(AttributedElement attrs) {
                 try {
-                    if (info.getName().startsWith("["))
-                        new Signature(info.name_index).getType(constant_pool).accept(this, null);
-                    else
-                        addDependency(info.getBaseName());
-                    return null;
-                } catch (ConstantPoolException e) {
-                    throw new ClassFileError(e);
-                }
-            }
-
-            public Void visitDouble(CONSTANT_Double_info info, Void p) {
-                return null;
-            }
-
-            public Void visitFieldref(CONSTANT_Fieldref_info info, Void p) {
-                return visitRef(info, p);
-            }
-
-            public Void visitFloat(CONSTANT_Float_info info, Void p) {
-                return null;
-            }
-
-            public Void visitInteger(CONSTANT_Integer_info info, Void p) {
-                return null;
-            }
-
-            public Void visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, Void p) {
-                return visitRef(info, p);
-            }
-
-            public Void visitInvokeDynamic(CONSTANT_InvokeDynamic_info info, Void p) {
-                return null;
-            }
-
-            @Override
-            public Void visitDynamicConstant(CONSTANT_Dynamic_info info, Void aVoid) {
-                return null;
-            }
-
-            public Void visitLong(CONSTANT_Long_info info, Void p) {
-                return null;
-            }
-
-            public Void visitMethodHandle(CONSTANT_MethodHandle_info info, Void p) {
-                return null;
-            }
-
-            public Void visitMethodType(CONSTANT_MethodType_info info, Void p) {
-                return null;
-            }
+                    var sa = attrs.findAttribute(Attributes.SIGNATURE).orElse(null);
+                    if (sa != null) {
+                        switch (attrs) {
+                            case ClassModel _ -> scan(sa.asClassSignature());
+                            case MethodModel _ -> scan(sa.asMethodSignature());
+                            default -> scan(sa.asTypeSignature());
+                        }
+                    }
 
-            public Void visitMethodref(CONSTANT_Methodref_info info, Void p) {
-                return visitRef(info, p);
-            }
+                    var rvaa = attrs.findAttribute(Attributes.RUNTIME_VISIBLE_ANNOTATIONS).orElse(null);
+                    if (rvaa != null) {
+                        for (var anno : rvaa.annotations()) {
+                            scan(anno.classSymbol());
+                        }
+                    }
 
-            public Void visitModule(CONSTANT_Module_info info, Void p) {
-                return null;
-            }
+                    var rvpaa = attrs.findAttribute(Attributes.RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS).orElse(null);
+                    if (rvpaa != null) {
+                        for (var parameter : rvpaa.parameterAnnotations()) {
+                            for (var anno : parameter) {
+                                scan(anno.classSymbol());
+                            }
+                        }
+                    }
 
-            public Void visitNameAndType(CONSTANT_NameAndType_info info, Void p) {
-                try {
-                    new Signature(info.type_index).getType(constant_pool).accept(this, null);
-                    return null;
-                } catch (ConstantPoolException e) {
+                    var exceptions = attrs.findAttribute(Attributes.EXCEPTIONS).orElse(null);
+                    if (exceptions != null) {
+                        for (var e : exceptions.exceptions()) {
+                            addClass(e);
+                        }
+                    }
+                } catch (IllegalArgumentException e) {
                     throw new ClassFileError(e);
                 }
             }
 
-            public Void visitPackage(CONSTANT_Package_info info, Void p) {
-                return null;
-            }
-
-            public Void visitString(CONSTANT_String_info info, Void p) {
-                return null;
-            }
-
-            public Void visitUtf8(CONSTANT_Utf8_info info, Void p) {
-                return null;
-            }
+            // ConstantPool scanning
 
-            private Void visitRef(CPRefInfo info, Void p) {
+            void scan(PoolEntry cpInfo) {
                 try {
-                    visitClass(info.getClassInfo(), p);
-                    return null;
-                } catch (ConstantPoolException e) {
+                    switch (cpInfo) {
+                        case ClassEntry clazz -> scan(clazz.asSymbol());
+                        case FieldRefEntry field -> scan(field.owner().asSymbol());
+                        case MethodRefEntry method -> scan(method.owner().asSymbol());
+                        case InterfaceMethodRefEntry interfaceMethod -> scan(interfaceMethod.owner().asSymbol());
+                        case NameAndTypeEntry nat -> {
+                            var desc = nat.type();
+                            if (desc.charAt(0) == '(') {
+                                scan(MethodTypeDesc.ofDescriptor(desc.stringValue()));
+                            } else {
+                                scan(ClassDesc.ofDescriptor(desc.stringValue()));
+                            }
+                        }
+                        default -> {}
+                    }
+                } catch (IllegalArgumentException e) {
                     throw new ClassFileError(e);
                 }
             }
 
-            // Type.Visitor methods
+            // Signature scanning
 
-            private void findDependencies(Type t) {
-                if (t != null)
-                    t.accept(this, null);
-            }
-
-            private void findDependencies(List<? extends Type> ts) {
-                if (ts != null) {
-                    for (Type t: ts)
-                        t.accept(this, null);
+            private void scan(MethodSignature sig) {
+                for (var param : sig.typeParameters()) {
+                    scan(param);
+                }
+                for (var param : sig.arguments()) {
+                    scan(param);
+                }
+                scan(sig.result());
+                for (var thrown : sig.throwableSignatures()) {
+                    scan(thrown);
                 }
             }
 
-            public Void visitSimpleType(SimpleType type, Void p) {
-                return null;
-            }
-
-            public Void visitArrayType(ArrayType type, Void p) {
-                findDependencies(type.elemType);
-                return null;
-            }
-
-            public Void visitMethodType(MethodType type, Void p) {
-                findDependencies(type.paramTypes);
-                findDependencies(type.returnType);
-                findDependencies(type.throwsTypes);
-                findDependencies(type.typeParamTypes);
-                return null;
-            }
-
-            public Void visitClassSigType(ClassSigType type, Void p) {
-                findDependencies(type.superclassType);
-                findDependencies(type.superinterfaceTypes);
-                return null;
-            }
-
-            public Void visitClassType(ClassType type, Void p) {
-                findDependencies(type.outerType);
-                addDependency(type.getBinaryName());
-                findDependencies(type.typeArgs);
-                return null;
+            private void scan(ClassSignature sig) {
+                for (var param : sig.typeParameters()) {
+                    scan(param);
+                }
+                scan(sig.superclassSignature());
+                for (var itf : sig.superinterfaceSignatures()) {
+                    scan(itf);
+                }
             }
 
-            public Void visitTypeParamType(TypeParamType type, Void p) {
-                findDependencies(type.classBound);
-                findDependencies(type.interfaceBounds);
-                return null;
+            private void scan(Signature.TypeParam param) {
+                param.classBound().ifPresent(this::scan);
+                for (var itf : param.interfaceBounds()) {
+                    scan(itf);
+                }
             }
 
-            public Void visitWildcardType(WildcardType type, Void p) {
-                findDependencies(type.boundType);
-                return null;
+            private void scan(Signature sig) {
+                switch (sig) {
+                    case Signature.ClassTypeSig ct -> {
+                        ct.outerType().ifPresent(this::scan);
+                        scan(ct.classDesc());
+                        for (var arg : ct.typeArgs()) {
+                            if (arg instanceof Signature.TypeArg.Bounded bounded) {
+                                scan(bounded.boundType());
+                            }
+                        }
+                    }
+                    case Signature.ArrayTypeSig at -> scan(at.componentSignature());
+                    case Signature.BaseTypeSig _, Signature.TypeVarSig _ -> {}
+                }
             }
         }
     }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependency.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Dependency.java
similarity index 95%
rename from src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependency.java
rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Dependency.java
index 96c9427ec4a..713fc9ef0e9 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependency.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Dependency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,11 @@
  * questions.
  */
 
-package com.sun.tools.classfile;
+package com.sun.tools.jdeps;
 
 
+import java.lang.classfile.ClassModel;
+
 /**
  * A directed relationship between two {@link Dependency.Location Location}s.
  * Subtypes of {@code Dependency} may provide additional detail about the dependency.
@@ -56,7 +58,7 @@ public interface Finder {
          * @param classfile the class file to be examined
          * @return the dependencies located in the given class file.
          */
-        public Iterable<? extends Dependency> findDependencies(ClassFile classfile);
+        public Iterable<? extends Dependency> findDependencies(ClassModel classfile);
     }
 
 
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java
index d9a07700134..179043bc578 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,17 +28,15 @@
 import static com.sun.tools.jdeps.Analyzer.NOT_FOUND;
 import static java.util.stream.Collectors.*;
 
-import com.sun.tools.classfile.AccessFlags;
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.Dependencies;
-import com.sun.tools.classfile.Dependencies.ClassFileError;
-import com.sun.tools.classfile.Dependency;
-import com.sun.tools.classfile.Dependency.Location;
+import com.sun.tools.jdeps.Dependencies.ClassFileError;
+import com.sun.tools.jdeps.Dependency.Location;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.nio.file.Paths;
+import java.lang.classfile.AccessFlags;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.reflect.AccessFlag;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.HashMap;
@@ -46,7 +44,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.ExecutionException;
@@ -176,20 +173,20 @@ 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 (ClassFile cf : archive.reader().getClassFiles()) {
-                if (cf.access_flags.is(AccessFlags.ACC_MODULE))
+            for (var cf : archive.reader().getClassFiles()) {
+                if (cf.isModuleInfo())
                     continue;
 
                 String classFileName;
                 try {
-                    classFileName = cf.getName();
-                } catch (ConstantPoolException e) {
+                    classFileName = cf.thisClass().asInternalName();
+                } catch (IllegalArgumentException e) {
                     throw new ClassFileError(e);
                 }
 
                 // filter source class/archive
                 String cn = classFileName.replace('/', '.');
-                if (!finder.accept(archive, cn, cf.access_flags))
+                if (!finder.accept(archive, cn, cf.flags()))
                     continue;
 
                 // tests if this class matches the -include
@@ -217,24 +214,24 @@ private Optional<FutureTask<Set<Location>>> parse(Archive archive, Finder finder
     private Set<Location> parse(Archive archive, Finder finder, String name)
         throws IOException
     {
-        ClassFile cf = archive.reader().getClassFile(name);
+        var cf = archive.reader().getClassFile(name);
         if (cf == null) {
             throw new IllegalArgumentException(archive.getName() +
                 " does not contain " + name);
         }
 
-        if (cf.access_flags.is(AccessFlags.ACC_MODULE))
+        if (cf.isModuleInfo())
             return Collections.emptySet();
 
         Set<Location> targets = new HashSet<>();
         String cn;
         try {
-            cn =  cf.getName().replace('/', '.');
-        } catch (ConstantPoolException e) {
+            cn =  cf.thisClass().asInternalName().replace('/', '.');
+        } catch (IllegalArgumentException e) {
             throw new Dependencies.ClassFileError(e);
         }
 
-        if (!finder.accept(archive, cn, cf.access_flags))
+        if (!finder.accept(archive, cn, cf.flags()))
             return targets;
 
         // tests if this class matches the -include
@@ -296,7 +293,7 @@ private static class Finder implements Dependency.Finder, SourceFilter {
         Finder(boolean apiOnly) {
             this.apiOnly = apiOnly;
             this.finder = apiOnly
-                ? Dependencies.getAPIFinder(AccessFlags.ACC_PROTECTED)
+                ? Dependencies.getAPIFinder(ClassFile.ACC_PROTECTED)
                 : Dependencies.getClassDependencyFinder();
 
         }
@@ -309,12 +306,12 @@ public boolean accept(Archive archive, String cn, AccessFlags accessFlags) {
             // if -apionly is specified, analyze only exported and public types
             // All packages are exported in unnamed module.
             return apiOnly ? archive.getModule().isExported(pn) &&
-                                 accessFlags.is(AccessFlags.ACC_PUBLIC)
+                                 accessFlags.has(AccessFlag.PUBLIC)
                            : true;
         }
 
         @Override
-        public Iterable<? extends Dependency> findDependencies(ClassFile classfile) {
+        public Iterable<? extends Dependency> findDependencies(ClassModel classfile) {
             return finder.findDependencies(classfile);
         }
     }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java
index 8ff7d4911d2..accf5d70e8f 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,9 @@
 
 package com.sun.tools.jdeps;
 
-import com.sun.tools.classfile.Dependency.Location;
+import com.sun.tools.jdeps.Dependency.Location;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Deque;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java
index 4684dd32846..e3071c27064 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,6 @@
 import static com.sun.tools.jdeps.Module.trace;
 import static java.util.stream.Collectors.*;
 
-import com.sun.tools.classfile.Dependency;
-
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsFilter.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsFilter.java
index 3ab46528fc7..344efd8d0f8 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsFilter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,7 @@
  */
 package com.sun.tools.jdeps;
 
-import com.sun.tools.classfile.Dependencies;
-import com.sun.tools.classfile.Dependency;
-import com.sun.tools.classfile.Dependency.Location;
+import com.sun.tools.jdeps.Dependency.Location;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java
index 60631663b9b..693f219ad95 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,6 @@
 import static java.lang.module.ModuleDescriptor.Requires.Modifier.*;
 import static java.util.stream.Collectors.*;
 
-import com.sun.tools.classfile.Dependency;
-
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.lang.module.ModuleDescriptor;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/VersionHelper.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/VersionHelper.java
index 227c9ccd264..fc139c9f595 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/VersionHelper.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/VersionHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,7 @@
 
 package com.sun.tools.jdeps;
 
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPoolException;
-
+import java.lang.classfile.ClassModel;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.jar.JarEntry;
@@ -44,8 +42,8 @@ public static String get(String classname) {
         return classname;
     }
 
-    public static void add(JarFile jarfile, JarEntry e, ClassFile cf)
-            throws ConstantPoolException
+    public static void add(JarFile jarfile, JarEntry e, ClassModel cf)
+            throws IllegalArgumentException
     {
         String realName = e.getRealName();
         if (realName.startsWith(META_INF_VERSIONS)) {
@@ -54,7 +52,7 @@ public static void add(JarFile jarfile, JarEntry e, ClassFile cf)
             if (n > 0) {
                 String version = realName.substring(len, n);
                 assert (Integer.parseInt(version) > 8);
-                String name = cf.getName().replace('/', '.');
+                String name = cf.thisClass().asInternalName().replace('/', '.');
                 String v = nameToVersion.computeIfAbsent(name, _n -> version);
                 if (!version.equals(v)) {
                     throw new MultiReleaseException("err.multirelease.version.associated",
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java
index c7a240ef47d..e2c2f49adec 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,8 @@
  * Methods may be added to the interfaces in the JDI packages in future
  * releases. Existing packages may be renamed if the JDI becomes a standard
  * extension.
+ *
+ * @since 1.3
  */
 
 package com.sun.jdi.connect;
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java
index ad8a359817f..68323fc1ddb 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * This package comprises the interfaces and classes used to
  * develop new {@link com.sun.jdi.connect.spi.TransportService}
  * implementations.
+ *
+ * @since 1.5
  */
 
 package com.sun.jdi.connect.spi;
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java
index 921df07a72d..7435454d8a7 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,8 @@
  * Methods may be added to the interfaces in the JDI packages in future
  * releases. Existing packages may be renamed if the JDI becomes a standard
  * extension.
+ *
+ * @since 1.3
  */
 
 package com.sun.jdi.event;
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/package-info.java b/src/jdk.jdi/share/classes/com/sun/jdi/package-info.java
index 3b34bc24182..9b9b82ba577 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/package-info.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,8 @@
  * Methods may be added to the interfaces in the JDI packages in future
  * releases. Existing packages may be renamed if the JDI becomes a standard
  * extension.
+ *
+ * @since 1.3
  */
 
 package com.sun.jdi;
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java
index 1b430cae426..d6cb01bc2f9 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,8 @@
  * Methods may be added to the interfaces in the JDI packages in future
  * releases. Existing packages may be renamed if the JDI becomes a standard
  * extension.
+ *
+ * @since 1.3
  */
 
 package com.sun.jdi.request;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
index c133a11b3c5..53b3599f9d9 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
@@ -29,6 +29,7 @@
 import java.io.RandomAccessFile;
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Repeatable;
+import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -37,7 +38,6 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -243,67 +243,24 @@ public static void ensureInitialized(Class<? extends jdk.internal.event.Event> e
     }
 
     public static Object makePrimitiveArray(String typeName, List<Object> values) {
+        Class<?> componentType = makePrimitiveType(typeName);
+        if (componentType == null) {
+            return null;
+        }
         int length = values.size();
-        switch (typeName) {
-        case "int":
-            int[] ints = new int[length];
-            for (int i = 0; i < length; i++) {
-                ints[i] = (int) values.get(i);
-            }
-            return ints;
-        case "long":
-            long[] longs = new long[length];
-            for (int i = 0; i < length; i++) {
-                longs[i] = (long) values.get(i);
-            }
-            return longs;
-
-        case "float":
-            float[] floats = new float[length];
-            for (int i = 0; i < length; i++) {
-                floats[i] = (float) values.get(i);
-            }
-            return floats;
-
-        case "double":
-            double[] doubles = new double[length];
-            for (int i = 0; i < length; i++) {
-                doubles[i] = (double) values.get(i);
-            }
-            return doubles;
-
-        case "short":
-            short[] shorts = new short[length];
-            for (int i = 0; i < length; i++) {
-                shorts[i] = (short) values.get(i);
-            }
-            return shorts;
-        case "char":
-            char[] chars = new char[length];
-            for (int i = 0; i < length; i++) {
-                chars[i] = (char) values.get(i);
-            }
-            return chars;
-        case "byte":
-            byte[] bytes = new byte[length];
-            for (int i = 0; i < length; i++) {
-                bytes[i] = (byte) values.get(i);
-            }
-            return bytes;
-        case "boolean":
-            boolean[] booleans = new boolean[length];
-            for (int i = 0; i < length; i++) {
-                booleans[i] = (boolean) values.get(i);
-            }
-            return booleans;
-        case "java.lang.String":
-            String[] strings = new String[length];
-            for (int i = 0; i < length; i++) {
-                strings[i] = (String) values.get(i);
-            }
-            return strings;
+        Object array =  Array.newInstance(componentType, length);
+        for (int index = 0; index < length; index++) {
+            Array.set(array, index, values.get(index));
         }
-        return null;
+        return array;
+    }
+
+    private static Class<?> makePrimitiveType(String typeName) {
+        return switch(typeName) {
+            case "void" -> null;
+            case "java.lang.String" -> String.class;
+            default -> Class.forPrimitiveName(typeName);
+        };
     }
 
     public static boolean isSettingVisible(long typeId, boolean hasEventHook) {
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java
index 202f29e3140..68901aebc84 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,8 @@
 import java.io.Writer;
 import java.nio.charset.Charset;
 import java.util.Arrays;
+import java.util.Locale;
+
 import jdk.internal.io.JdkConsole;
 import jdk.internal.io.JdkConsoleProvider;
 import jdk.jshell.JShellConsole;
@@ -193,8 +195,8 @@ public void close() throws IOException {
          * {@inheritDoc}
          */
         @Override
-        public JdkConsole format(String fmt, Object... args) {
-            writer().format(fmt, args).flush();
+        public JdkConsole format(Locale locale, String format, Object... args) {
+            writer().format(locale, format, args).flush();
             return this;
         }
 
@@ -202,19 +204,11 @@ public JdkConsole format(String fmt, Object... args) {
          * {@inheritDoc}
          */
         @Override
-        public JdkConsole printf(String format, Object... args) {
-            return format(format, args);
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public String readLine(String fmt, Object... args) {
+        public String readLine(Locale locale, String format, Object... args) {
             try {
                 return sendAndReceive(() -> {
                     remoteInput.write(Task.READ_LINE.ordinal());
-                    String prompt = fmt.formatted(args);
+                    String prompt = String.format(locale, format, args);
                     char[] chars = prompt.toCharArray();
                     sendChars(chars, 0, chars.length);
                     char[] line = readChars();
@@ -230,18 +224,18 @@ public String readLine(String fmt, Object... args) {
          */
         @Override
         public String readLine() {
-            return readLine("");
+            return readLine(Locale.getDefault(Locale.Category.FORMAT), "");
         }
 
         /**
          * {@inheritDoc}
          */
         @Override
-        public char[] readPassword(String fmt, Object... args) {
+        public char[] readPassword(Locale locale, String format, Object... args) {
             try {
                 return sendAndReceive(() -> {
                     remoteInput.write(Task.READ_PASSWORD.ordinal());
-                    String prompt = fmt.formatted(args);
+                    String prompt = String.format(locale, format, args);
                     char[] chars = prompt.toCharArray();
                     sendChars(chars, 0, chars.length);
                     return readChars();
@@ -256,7 +250,7 @@ public char[] readPassword(String fmt, Object... args) {
          */
         @Override
         public char[] readPassword() {
-            return readPassword("");
+            return readPassword(Locale.getDefault(Locale.Category.FORMAT), "");
         }
 
         /**
diff --git a/test/hotspot/gtest/gc/shenandoah/test_shenandoahSimpleBitMap.cpp b/test/hotspot/gtest/gc/shenandoah/test_shenandoahSimpleBitMap.cpp
new file mode 100644
index 00000000000..c9a6d638ba8
--- /dev/null
+++ b/test/hotspot/gtest/gc/shenandoah/test_shenandoahSimpleBitMap.cpp
@@ -0,0 +1,451 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include "precompiled.hpp"
+#include "gc/shenandoah/shenandoahSimpleBitMap.hpp"
+#include "gc/shenandoah/shenandoahSimpleBitMap.inline.hpp"
+
+#include <iostream>
+#include "utilities/ostream.hpp"
+#include "utilities/vmassert_uninstall.hpp"
+#include "utilities/vmassert_reinstall.hpp"
+#include "unittest.hpp"
+
+static bool _success;
+static size_t _assertion_failures;
+
+#define BitMapAssertEqual(a, b)  ASSERT_EQ((a), (b)); if ((a) != (b)) { _assertion_failures++; }
+
+class ShenandoahSimpleBitMapTest: public ::testing::Test {
+protected:
+
+  static const ssize_t SMALL_BITMAP_SIZE =  512;
+  static const ssize_t LARGE_BITMAP_SIZE = 4096;
+
+  // set_bits[] is an array of indexes holding bits that are supposed to be set, in increasing order.
+  static void verifyBitMapState(ShenandoahSimpleBitMap& bm, ssize_t size, ssize_t set_bits[], ssize_t num_set_bits) {
+    // Verify number of bits
+    BitMapAssertEqual(bm.size(), size);
+
+    ssize_t set_bit_index = 0;
+    // Check that is_set(idx) for every possible idx
+    for (ssize_t i = 0; i < size; i++) {
+      bool is_set = bm.is_set(i);
+      bool intended_value = false;;
+      if (set_bit_index < num_set_bits) {
+        if (set_bits[set_bit_index] == i) {
+          intended_value = true;
+          set_bit_index++;
+        }
+      } else {
+        // If we've exhausted set_bits array, there should be no more set_bits
+        BitMapAssertEqual(is_set, false);
+        BitMapAssertEqual(set_bit_index, num_set_bits);
+      }
+      BitMapAssertEqual(is_set, intended_value);
+    }
+    BitMapAssertEqual(set_bit_index, num_set_bits);
+
+    // Check that bits_at(array_idx) matches intended value for every valid array_idx value
+    set_bit_index = 0;
+    ssize_t alignment = bm.alignment();
+    for (ssize_t i = 0; i < size; i += alignment) {
+      size_t bits = bm.bits_at(i);
+      for (ssize_t b = 0; b < alignment; b++) {
+        ssize_t bit_value = i + b;
+        bool intended_value = false;;
+        if (set_bit_index < num_set_bits) {
+          if (set_bits[set_bit_index] == bit_value) {
+            intended_value = true;
+            set_bit_index++;
+          }
+        }
+        size_t bit_mask = ((size_t) 0x01) << b;
+        bool is_set = (bits & bit_mask) != 0;
+        BitMapAssertEqual(is_set, intended_value);
+      }
+    }
+
+    // Make sure find_first_set_bit() works correctly
+    ssize_t probe_point = 0;
+    for (ssize_t i = 0; i < num_set_bits; i++) {
+      ssize_t next_expected_bit = set_bits[i];
+      probe_point = bm.find_first_set_bit(probe_point);
+      BitMapAssertEqual(probe_point, next_expected_bit);
+      probe_point++;            // Prepare to look beyond the most recent bit.
+    }
+    if (probe_point < size) {
+      probe_point = bm.find_first_set_bit(probe_point);
+      BitMapAssertEqual(probe_point, size); // Verify that last failed search returns sentinel value: num bits in bit map
+    }
+
+    // Confirm that find_first_set_bit() with a bounded search space works correctly
+    // Limit this search to the first 3/4 of the full bit map
+    ssize_t boundary_idx = 3 * size / 4;
+    probe_point = 0;
+    for (ssize_t i = 0; i < num_set_bits; i++) {
+      ssize_t next_expected_bit = set_bits[i];
+      if (next_expected_bit >= boundary_idx) {
+        break;
+      } else {
+        probe_point = bm.find_first_set_bit(probe_point, boundary_idx);
+        BitMapAssertEqual(probe_point, next_expected_bit);
+        probe_point++;            // Prepare to look beyond the most recent bit.
+      }
+    }
+    if (probe_point < boundary_idx) {
+      // In case there are no set bits in the last 1/4 of bit map, confirm that last failed search returns sentinel: boundary_idx
+      probe_point = bm.find_first_set_bit(probe_point, boundary_idx);
+      BitMapAssertEqual(probe_point, boundary_idx);
+    }
+
+    // Make sure find_last_set_bit() works correctly
+    probe_point = size - 1;
+    for (ssize_t i = num_set_bits - 1; i >= 0; i--) {
+      ssize_t next_expected_bit = set_bits[i];
+      probe_point = bm.find_last_set_bit(probe_point);
+      BitMapAssertEqual(probe_point, next_expected_bit);
+      probe_point--;            // Prepare to look before the most recent bit.
+    }
+    if (probe_point >= 0) {
+      probe_point = bm.find_last_set_bit(probe_point);
+      BitMapAssertEqual(probe_point, (ssize_t) -1); // Verify that last failed search returns sentinel value: -1
+    }
+
+    // Confirm that find_last_set_bit() with a bounded search space works correctly
+    // Limit this search to the last 3/4 of the full bit map
+    boundary_idx = size / 4;
+    probe_point = size - 1;
+    for (ssize_t i = num_set_bits - 1; i >= 0; i--) {
+      ssize_t next_expected_bit = set_bits[i];
+      if (next_expected_bit > boundary_idx) {
+        probe_point = bm.find_last_set_bit(boundary_idx, probe_point);
+        BitMapAssertEqual(probe_point, next_expected_bit);
+        probe_point--;
+      } else {
+        break;
+      }
+    }
+    if (probe_point > boundary_idx) {
+      probe_point = bm.find_last_set_bit(boundary_idx, probe_point);
+        // Verify that last failed search returns sentinel value: boundary_idx
+      BitMapAssertEqual(probe_point, boundary_idx);
+    }
+
+    // What's the longest cluster of consecutive bits
+    ssize_t previous_value = -2;
+    ssize_t longest_run = 0;
+    ssize_t current_run = 0;
+    for (ssize_t i = 0; i < num_set_bits; i++) {
+      ssize_t next_expected_bit = set_bits[i];
+      if (next_expected_bit == previous_value + 1) {
+        current_run++;
+      } else {
+        previous_value = next_expected_bit;
+        current_run = 1;
+      }
+      if (current_run > longest_run) {
+        longest_run = current_run;
+      }
+      previous_value = next_expected_bit;
+    }
+
+    // Confirm that find_first_consecutive_set_bits() works for each cluster size known to have at least one match
+    for (ssize_t cluster_size = 1; cluster_size <= longest_run; cluster_size++) {
+      // Verify that find_first_consecutive_set_bits() works
+      ssize_t bit_idx = 0;
+      ssize_t probe_point = 0;
+      while ((probe_point <= size - cluster_size) && (bit_idx <= num_set_bits - cluster_size)) {
+        bool cluster_found = false;
+        while (!cluster_found && (bit_idx + cluster_size <= num_set_bits)) {
+          cluster_found = true;
+          for (ssize_t i = 1; i < cluster_size; i++) {
+            if (set_bits[bit_idx] + i != set_bits[bit_idx + i]) {
+              cluster_found = false;
+              bit_idx++;
+              break;
+            }
+          }
+        }
+        if (cluster_found) {
+          ssize_t next_expected_cluster = set_bits[bit_idx];
+          ssize_t orig_probe_point = probe_point;
+          probe_point = bm.find_first_consecutive_set_bits(orig_probe_point, cluster_size);
+          BitMapAssertEqual(next_expected_cluster, probe_point);
+          probe_point++;
+          bit_idx++;
+        } else {
+          bit_idx++;
+          break;
+        }
+      }
+      if (probe_point < size) {
+        // Confirm that the last request, which fails to find a cluster, returns sentinel value: num_bits
+        probe_point = bm.find_first_consecutive_set_bits(probe_point, cluster_size);
+        BitMapAssertEqual(probe_point, size);
+      }
+
+      // Repeat the above experiment, using 3/4 size as the search boundary_idx
+      bit_idx = 0;
+      probe_point = 0;
+      boundary_idx = 4 * size / 4;
+      while ((probe_point <= boundary_idx - cluster_size) && (bit_idx <= num_set_bits - cluster_size)) {
+        bool cluster_found = false;
+        while (!cluster_found && (bit_idx + cluster_size <= num_set_bits)) {
+          cluster_found = true;
+          for (int i = 1; i < cluster_size; i++) {
+            if (set_bits[bit_idx] + i != set_bits[bit_idx + i]) {
+              cluster_found = false;
+              bit_idx++;
+              break;
+            }
+          }
+        }
+        if (cluster_found) {
+          ssize_t next_expected_cluster = set_bits[bit_idx];
+          probe_point = bm.find_first_consecutive_set_bits(probe_point, boundary_idx, cluster_size);
+          BitMapAssertEqual(next_expected_cluster, probe_point);
+          probe_point++;
+          bit_idx++;
+        } else {
+          bit_idx++;
+        }
+      }
+      if (probe_point < boundary_idx) {
+        // Confirm that the last request, which fails to find a cluster, returns sentinel value: boundary_idx
+        probe_point = bm.find_first_consecutive_set_bits(probe_point, boundary_idx, cluster_size);
+        BitMapAssertEqual(probe_point, boundary_idx);
+      }
+
+      // Verify that find_last_consecutive_set_bits() works
+      bit_idx = num_set_bits - 1;
+      probe_point = size - 1;
+      // Iterate over all set bits in reverse order
+      while (bit_idx + 1 >= cluster_size) {
+        bool cluster_found = true;
+        for (int i = 1; i < cluster_size; i++) {
+          if (set_bits[bit_idx] - i != set_bits[bit_idx - i]) {
+            cluster_found = false;
+            break;
+          }
+        }
+        if (cluster_found) {
+          ssize_t next_expected_cluster = set_bits[bit_idx] + 1 - cluster_size;
+          probe_point = bm.find_last_consecutive_set_bits(probe_point, cluster_size);
+          BitMapAssertEqual(next_expected_cluster, probe_point);
+          probe_point = probe_point + cluster_size - 2;
+          bit_idx--;
+        } else {
+          bit_idx--;
+        }
+      }
+      if (probe_point >= 0) {
+        // Confirm that the last request, which fails to find a cluster, returns sentinel value: boundary_idx
+        probe_point = bm.find_last_consecutive_set_bits(boundary_idx, probe_point, cluster_size);
+        BitMapAssertEqual(probe_point, (ssize_t) boundary_idx);
+      }
+
+      // Verify that find_last_consecutive_set_bits() works with the search range bounded at 1/4 size
+      bit_idx = num_set_bits - 1;
+      probe_point = size - 1;
+      boundary_idx = size / 4;
+      while (bit_idx + 1 >= cluster_size) {
+        bool cluster_found = true;
+        for (int i = 1; i < cluster_size; i++) {
+          if (set_bits[bit_idx] - i != set_bits[bit_idx - i]) {
+            cluster_found = false;
+            break;
+          }
+        }
+        if (cluster_found && (set_bits[bit_idx] + 1 - cluster_size > boundary_idx)) {
+          ssize_t next_expected_cluster = set_bits[bit_idx] + 1 - cluster_size;
+          probe_point = bm.find_last_consecutive_set_bits(boundary_idx, probe_point, cluster_size);
+          BitMapAssertEqual(next_expected_cluster, probe_point);
+          probe_point = probe_point + cluster_size - 2;
+          bit_idx--;
+        } else if (set_bits[bit_idx] + 1 - cluster_size <= boundary_idx) {
+          break;
+        } else {
+          bit_idx--;
+        }
+      }
+      if (probe_point > boundary_idx) {
+        // Confirm that the last request, which fails to find a cluster, returns sentinel value: boundary_idx
+        probe_point = bm.find_last_consecutive_set_bits(boundary_idx, probe_point, cluster_size);
+        BitMapAssertEqual(probe_point, boundary_idx);
+      }
+    }
+
+    // Confirm that find_first_consecutive_set_bits() works for a cluster size known not to have any matches
+    probe_point = bm.find_first_consecutive_set_bits(0, longest_run + 1);
+    BitMapAssertEqual(probe_point, size);  // Confirm: failed search returns sentinel: size
+
+    probe_point = bm.find_last_consecutive_set_bits(size - 1, longest_run + 1);
+    BitMapAssertEqual(probe_point, (ssize_t) -1);    // Confirm: failed search returns sentinel: -1
+
+    boundary_idx = 3 * size / 4;
+    probe_point = bm.find_first_consecutive_set_bits(0, boundary_idx, longest_run + 1);
+    BitMapAssertEqual(probe_point, boundary_idx); // Confirm: failed search returns sentinel: boundary_idx
+
+    boundary_idx = size / 4;
+    probe_point = bm.find_last_consecutive_set_bits(boundary_idx, size - 1, longest_run + 1);
+    BitMapAssertEqual(probe_point, boundary_idx);           // Confirm: failed search returns sentinel: boundary_idx
+  }
+
+public:
+
+  static bool run_test() {
+
+    _success = false;
+    _assertion_failures = 0;
+
+    ShenandoahSimpleBitMap bm_small(SMALL_BITMAP_SIZE);
+    ShenandoahSimpleBitMap bm_large(LARGE_BITMAP_SIZE);
+
+    // Initial state of each bitmap is all bits are clear.  Confirm this:
+    ssize_t set_bits_0[1] = { 0 };
+    verifyBitMapState(bm_small, SMALL_BITMAP_SIZE, set_bits_0, 0);
+    verifyBitMapState(bm_large, LARGE_BITMAP_SIZE, set_bits_0, 0);
+
+    bm_small.set_bit(5);
+    bm_small.set_bit(63);
+    bm_small.set_bit(128);
+    ssize_t set_bits_1[3] = { 5, 63, 128 };
+    verifyBitMapState(bm_small, SMALL_BITMAP_SIZE, set_bits_1, 3);
+
+    bm_large.set_bit(5);
+    bm_large.set_bit(63);
+    bm_large.set_bit(128);
+    verifyBitMapState(bm_large, LARGE_BITMAP_SIZE, set_bits_1, 3);
+
+    // Test some consecutive bits
+    bm_small.set_bit(140);
+    bm_small.set_bit(141);
+    bm_small.set_bit(142);
+
+    bm_small.set_bit(253);
+    bm_small.set_bit(254);
+    bm_small.set_bit(255);
+
+    bm_small.set_bit(271);
+    bm_small.set_bit(272);
+
+    bm_small.set_bit(320);
+    bm_small.set_bit(321);
+    bm_small.set_bit(322);
+
+    bm_small.set_bit(361);
+
+    ssize_t set_bits_2[15] = { 5, 63, 128, 140, 141, 142, 253, 254, 255, 271, 272, 320, 321, 322, 361 };
+    verifyBitMapState(bm_small, SMALL_BITMAP_SIZE, set_bits_2, 15);
+
+    bm_large.set_bit(140);
+    bm_large.set_bit(141);
+    bm_large.set_bit(142);
+
+    bm_large.set_bit(1021);
+    bm_large.set_bit(1022);
+    bm_large.set_bit(1023);
+
+    bm_large.set_bit(1051);
+
+    bm_large.set_bit(1280);
+    bm_large.set_bit(1281);
+    bm_large.set_bit(1282);
+
+    bm_large.set_bit(1300);
+    bm_large.set_bit(1301);
+    bm_large.set_bit(1302);
+
+    ssize_t set_bits_3[16] = { 5, 63, 128, 140, 141, 142, 1021, 1022, 1023, 1051, 1280, 1281, 1282, 1300, 1301, 1302 };
+    verifyBitMapState(bm_large, LARGE_BITMAP_SIZE, set_bits_3, 16);
+
+    // Test clear_bit
+    bm_small.clear_bit(141);
+    bm_small.clear_bit(253);
+    ssize_t set_bits_4[13] = { 5, 63, 128, 140, 142, 254, 255, 271, 272, 320, 321, 322, 361 };
+    verifyBitMapState(bm_small, SMALL_BITMAP_SIZE, set_bits_4, 13);
+
+    bm_large.clear_bit(5);
+    bm_large.clear_bit(63);
+    bm_large.clear_bit(128);
+    bm_large.clear_bit(141);
+    ssize_t set_bits_5[12] = { 140, 142, 1021, 1022, 1023, 1051, 1280, 1281, 1282, 1300, 1301, 1302 };
+    verifyBitMapState(bm_large, LARGE_BITMAP_SIZE, set_bits_5, 12);
+
+    // Look for large island of contiguous surrounded by smaller islands of contiguous
+    bm_large.set_bit(1024);
+    bm_large.set_bit(1025);  // size-5 island from 1021 to 1025
+    bm_large.set_bit(1027);
+    bm_large.set_bit(1028);
+    bm_large.set_bit(1029);
+    bm_large.set_bit(1030);
+    bm_large.set_bit(1031);
+    bm_large.set_bit(1032);  // size-6 island from 1027 to 1032
+    bm_large.set_bit(1034);
+    bm_large.set_bit(1035);
+    bm_large.set_bit(1036);  // size-3 island from 1034 to 1036
+    ssize_t set_bits_6[23] = {  140,  142, 1021, 1022, 1023, 1024, 1025, 1027, 1028, 1029, 1030,
+                               1031, 1032, 1034, 1035, 1036, 1051, 1280, 1281, 1282, 1300, 1301, 1302 };
+    verifyBitMapState(bm_large, LARGE_BITMAP_SIZE, set_bits_6, 23);
+
+    // Test that entire bitmap word (from 1024 to 1088) is 1's
+    ssize_t set_bits_7[76];
+    set_bits_7[0] = 140;
+    set_bits_7[1] = 142;
+    set_bits_7[2] = 1021;
+    set_bits_7[3] = 1022;
+    set_bits_7[4] = 1023;
+    size_t bit_idx = 5;
+    for (ssize_t i = 1024; i <= 1088; i++) {
+      bm_large.set_bit(i);
+      set_bits_7[bit_idx++] = i;
+    }
+    set_bits_7[bit_idx++] = 1280;
+    set_bits_7[bit_idx++] = 1281;
+    set_bits_7[bit_idx++] = 1282;
+    set_bits_7[bit_idx++] = 1300;
+    set_bits_7[bit_idx++] = 1301;
+    set_bits_7[bit_idx++] = 1302;
+    verifyBitMapState(bm_large, LARGE_BITMAP_SIZE, set_bits_7, bit_idx);
+
+    // Test clear_all()
+    bm_small.clear_all();
+    bm_large.clear_all();
+
+    verifyBitMapState(bm_small, SMALL_BITMAP_SIZE, set_bits_0, 0);
+    verifyBitMapState(bm_large, LARGE_BITMAP_SIZE, set_bits_0, 0);
+
+    _success = true;
+    return true;
+  }
+
+};
+
+TEST(BasicShenandoahSimpleBitMapTest, minimum_test) {
+
+  bool result = ShenandoahSimpleBitMapTest::run_test();
+  ASSERT_EQ(result, true);
+  ASSERT_EQ(_success, true);
+  ASSERT_EQ(_assertion_failures, (size_t) 0);
+}
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index a0c1913e52c..a8cdad8b268 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -67,6 +67,7 @@ compiler/c2/Test8004741.java 8235801 generic-all
 compiler/c2/irTests/TestDuplicateBackedge.java 8318904 generic-all
 
 compiler/codecache/jmx/PoolsIndependenceTest.java 8264632 macosx-all
+compiler/codecache/CheckLargePages.java 8332654 linux-x64
 
 compiler/vectorapi/reshape/TestVectorReinterpret.java 8320897 aix-ppc64,linux-ppc64le
 compiler/vectorapi/VectorLogicalOpIdentityTest.java 8302459 linux-x64,windows-x64
@@ -78,6 +79,8 @@ compiler/floatingpoint/TestSubnormalDouble.java 8317810 generic-i586
 
 compiler/startup/StartupOutput.java 8326615 generic-x64
 
+compiler/rangechecks/TestArrayAccessAboveRCAfterRCCastIIEliminated.java 8332369 generic-all
+
 #############################################################################
 
 # :hotspot_gc
diff --git a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNullableLoads.java b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNullableLoads.java
new file mode 100644
index 00000000000..bf8c5cd24d4
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNullableLoads.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8330565
+ * @summary Check that Reduce Allocation Merges does not crash when legacy
+ *          string concatenation optimization is applied.
+ * @requires vm.flagless & vm.compiler2.enabled & vm.opt.final.EliminateAllocations
+ * @compile -XDstringConcat=inline TestReduceAllocationAndNullableLoads.java
+ * @run main/othervm -XX:CompileCommand=compileonly,*TestReduceAllocationAndNullableLoads*::*
+ *                   -XX:CompileCommand=dontinline,*TestReduceAllocationAndNullableLoads*::*
+ *                   -XX:-TieredCompilation -Xcomp -server
+ *                   compiler.c2.TestReduceAllocationAndNullableLoads
+ */
+
+package compiler.c2;
+
+public class TestReduceAllocationAndNullableLoads {
+    public static void main(String[] args) {
+        try {
+            // Load / initialize these classes
+            IllegalArgumentException e = new IllegalArgumentException("Reason is: ");
+            StringBuilder xixi = new StringBuilder("abc");
+
+            // The actual test
+            test(new char[] { 'a', 'b', 'c' });
+        } catch (IllegalArgumentException e) { }
+    }
+
+    public static void test(char[] chars) throws IllegalArgumentException {
+        String reason = null;
+
+        for (int i = 0; i < chars.length; i++) {
+            char c = chars[i];
+
+            if (c == 'a') {
+                reason = "first entry" + i;
+                break;
+            }
+        }
+
+        if (reason != null) {
+            throw new IllegalArgumentException("Reason is: " + reason);
+        }
+    }
+}
+
diff --git a/test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java b/test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java
index d39c195b55f..17556896f26 100644
--- a/test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java
@@ -481,6 +481,9 @@ void test_suba(int[] a0, int[] a1, int[] a2) {
     @Test
     @IR(counts = { IRNode.SUB_VI, "> 0", IRNode.LSHIFT_VI, "> 0" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = { IRNode.SUB_VI, "> 0", IRNode.LSHIFT_VI, "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     void test_mulc(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]*VALUE);
@@ -490,6 +493,9 @@ void test_mulc(int[] a0, int[] a1) {
     @Test
     @IR(counts = { IRNode.SUB_VI, "> 0", IRNode.LSHIFT_VI, "> 0" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = { IRNode.SUB_VI, "> 0", IRNode.LSHIFT_VI, "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     void test_mulc_n(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]*(-VALUE));
@@ -522,6 +528,14 @@ void test_mula(int[] a0, int[] a1, int[] a2) {
                    IRNode.SUB_VI,
                    IRNode.VECTOR_SIZE + "min(max_int, max_long)", "> 0" },
         applyIfCPUFeatureOr = {"avx2", "true", "sve", "true"})
+    @IR(counts = { IRNode.ADD_VI,
+                   IRNode.VECTOR_SIZE + "min(max_int, max_long)", "> 0",
+                   IRNode.RSHIFT_VI,
+                   IRNode.VECTOR_SIZE + "min(max_int, max_long)", "> 0",
+                   IRNode.SUB_VI,
+                   IRNode.VECTOR_SIZE + "min(max_int, max_long)", "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     // Not vectorized: On aarch64, vectorization for this example results in
     // MulVL nodes, which asimd does not support.
     @IR(counts = { IRNode.LOAD_VECTOR_I, "= 0",
@@ -542,6 +556,14 @@ void test_divc(int[] a0, int[] a1) {
                    IRNode.SUB_VI,
                    IRNode.VECTOR_SIZE + "min(max_int, max_long)", "> 0" },
         applyIfCPUFeatureOr = {"avx2", "true", "sve", "true"})
+    @IR(counts = { IRNode.ADD_VI,
+                   IRNode.VECTOR_SIZE + "min(max_int, max_long)", "> 0",
+                   IRNode.RSHIFT_VI,
+                   IRNode.VECTOR_SIZE + "min(max_int, max_long)", "> 0",
+                   IRNode.SUB_VI,
+                   IRNode.VECTOR_SIZE + "min(max_int, max_long)", "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     // Not vectorized: On aarch64, vectorization for this example results in
     // MulVL nodes, which asimd does not support.
     @IR(counts = { IRNode.LOAD_VECTOR_I, "= 0",
@@ -662,6 +684,9 @@ void test_xora(int[] a0, int[] a1, int[] a2) {
     @Test
     @IR(counts = { IRNode.LSHIFT_VI, "> 0" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = { IRNode.LSHIFT_VI, "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     void test_sllc(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]<<VALUE);
@@ -671,6 +696,9 @@ void test_sllc(int[] a0, int[] a1) {
     @Test
     @IR(counts = { IRNode.LSHIFT_VI, "> 0" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = { IRNode.LSHIFT_VI, "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     void test_sllc_n(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]<<(-VALUE));
@@ -683,6 +711,11 @@ void test_sllc_n(int[] a0, int[] a1) {
                    IRNode.LOAD_VECTOR_I, "> 0",
                    IRNode.STORE_VECTOR,  "> 0" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = { IRNode.LSHIFT_VI,     "= 0",
+                   IRNode.LOAD_VECTOR_I, "> 0",
+                   IRNode.STORE_VECTOR,  "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     void test_sllc_o(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]<<SHIFT);
@@ -695,6 +728,11 @@ void test_sllc_o(int[] a0, int[] a1) {
                    IRNode.LOAD_VECTOR_I, "> 0",
                    IRNode.STORE_VECTOR,  "> 0" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = { IRNode.LSHIFT_VI,     "= 0",
+                   IRNode.LOAD_VECTOR_I, "> 0",
+                   IRNode.STORE_VECTOR,  "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     void test_sllc_on(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]<<(-SHIFT));
@@ -704,6 +742,9 @@ void test_sllc_on(int[] a0, int[] a1) {
     @Test
     @IR(counts = { IRNode.LSHIFT_VI, "> 0" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = { IRNode.LSHIFT_VI, "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     void test_sllv(int[] a0, int[] a1, int b) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]<<b);
@@ -713,6 +754,9 @@ void test_sllv(int[] a0, int[] a1, int b) {
     @Test
     @IR(counts = { IRNode.URSHIFT_VI, "> 0" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = { IRNode.URSHIFT_VI, "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     void test_srlc(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]>>>VALUE);
@@ -722,6 +766,9 @@ void test_srlc(int[] a0, int[] a1) {
     @Test
     @IR(counts = { IRNode.URSHIFT_VI, "> 0" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = { IRNode.URSHIFT_VI, "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     void test_srlc_n(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]>>>(-VALUE));
@@ -734,6 +781,11 @@ void test_srlc_n(int[] a0, int[] a1) {
                    IRNode.LOAD_VECTOR_I, "> 0",
                    IRNode.STORE_VECTOR,  "> 0" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = { IRNode.URSHIFT_VI,    "= 0",
+                   IRNode.LOAD_VECTOR_I, "> 0",
+                   IRNode.STORE_VECTOR,  "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     void test_srlc_o(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]>>>SHIFT);
@@ -746,6 +798,11 @@ void test_srlc_o(int[] a0, int[] a1) {
                    IRNode.LOAD_VECTOR_I, "> 0",
                    IRNode.STORE_VECTOR,  "> 0" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = { IRNode.URSHIFT_VI,    "= 0",
+                   IRNode.LOAD_VECTOR_I, "> 0",
+                   IRNode.STORE_VECTOR,  "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     void test_srlc_on(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]>>>(-SHIFT));
@@ -755,6 +812,9 @@ void test_srlc_on(int[] a0, int[] a1) {
     @Test
     @IR(counts = { IRNode.URSHIFT_VI, "> 0" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = { IRNode.URSHIFT_VI, "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     void test_srlv(int[] a0, int[] a1, int b) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]>>>b);
@@ -764,6 +824,9 @@ void test_srlv(int[] a0, int[] a1, int b) {
     @Test
     @IR(counts = { IRNode.RSHIFT_VI, "> 0" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = { IRNode.RSHIFT_VI, "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     void test_srac(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]>>VALUE);
@@ -773,6 +836,9 @@ void test_srac(int[] a0, int[] a1) {
     @Test
     @IR(counts = { IRNode.RSHIFT_VI, "> 0" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = { IRNode.RSHIFT_VI, "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     void test_srac_n(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]>>(-VALUE));
@@ -785,6 +851,11 @@ void test_srac_n(int[] a0, int[] a1) {
                    IRNode.LOAD_VECTOR_I, "> 0",
                    IRNode.STORE_VECTOR,  "> 0" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = { IRNode.RSHIFT_VI,     "= 0",
+                   IRNode.LOAD_VECTOR_I, "> 0",
+                   IRNode.STORE_VECTOR,  "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     void test_srac_o(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]>>SHIFT);
@@ -797,6 +868,11 @@ void test_srac_o(int[] a0, int[] a1) {
                    IRNode.LOAD_VECTOR_I, "> 0",
                    IRNode.STORE_VECTOR,  "> 0" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = { IRNode.RSHIFT_VI,     "= 0",
+                   IRNode.LOAD_VECTOR_I, "> 0",
+                   IRNode.STORE_VECTOR,  "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     void test_srac_on(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]>>(-SHIFT));
@@ -806,6 +882,9 @@ void test_srac_on(int[] a0, int[] a1) {
     @Test
     @IR(counts = { IRNode.RSHIFT_VI, "> 0" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = { IRNode.RSHIFT_VI, "> 0" },
+        applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"})
     void test_srav(int[] a0, int[] a1, int b) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]>>b);
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestBackToBackMustBeNotNull.java b/test/hotspot/jtreg/compiler/c2/irTests/TestBackToBackMustBeNotNull.java
new file mode 100644
index 00000000000..9487df23d1c
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestBackToBackMustBeNotNull.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8332245
+ * @summary C2: missing record_for_ign() call in GraphKit::must_be_not_null()
+ *
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.TestBackToBackMustBeNotNull
+ */
+
+package compiler.c2.irTests;
+import jdk.internal.misc.Unsafe;
+import java.lang.reflect.Field;
+import compiler.lib.ir_framework.*;
+
+
+public class TestBackToBackMustBeNotNull {
+    static final jdk.internal.misc.Unsafe UNSAFE = Unsafe.getUnsafe();
+    static final long F_OFFSET;
+    private static A fieldA = new A();
+
+    static {
+        try {
+            Field fField = A.class.getDeclaredField("f");
+            F_OFFSET = UNSAFE.objectFieldOffset(fField);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    static public void main(String[] args) {
+        TestFramework.runWithFlags("--add-modules", "java.base", "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED");
+    }
+
+    @Test
+    @IR(phase = { CompilePhase.ITER_GVN1 }, counts = { IRNode.IF, "1" })
+    private static void test1() {
+        final Object o1 = UNSAFE.getReference(fieldA, F_OFFSET);
+        final Object o2 = UNSAFE.getReference(fieldA, F_OFFSET);
+        notInlined(o1, o2);
+    }
+
+    @DontInline
+    private static void notInlined(Object o1, Object o2) {
+
+    }
+
+    static class A {
+        Object f;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizeURShiftSubword.java b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizeURShiftSubword.java
index ebe3fe63ccf..f477a08f717 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizeURShiftSubword.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizeURShiftSubword.java
@@ -34,7 +34,8 @@
  * @bug 8283307
  * @key randomness
  * @summary Auto-vectorization enhancement for unsigned shift right on signed subword types
- * @requires ((os.arch=="amd64" | os.arch=="x86_64") & (vm.opt.UseSSE == "null" | vm.opt.UseSSE > 3)) | os.arch=="aarch64"
+ * @requires ((os.arch=="amd64" | os.arch=="x86_64") & (vm.opt.UseSSE == "null" | vm.opt.UseSSE > 3)) | os.arch=="aarch64" |
+ *           (os.arch == "riscv64" & vm.cpu.features ~= ".*v,.*")
  * @library /test/lib /
  * @run driver compiler.c2.irTests.TestVectorizeURShiftSubword
  */
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
index 47cec9f5e13..82d4a398ab6 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
@@ -104,6 +104,7 @@ public class IREncodingPrinter {
         "asimd",
         "sve",
         // Riscv64
+        "v",
         "zvbb"
     ));
 
@@ -158,22 +159,22 @@ private boolean shouldApplyIrRule(IR irAnno, String m, int ruleIndex, int ruleMa
         checkIRAnnotations(irAnno);
         if (isIRNodeUnsupported(irAnno)) {
             return false;
-        } else if (irAnno.applyIfPlatform().length != 0 && !hasAllRequiredPlatform(irAnno.applyIfPlatform())) {
+        } else if (irAnno.applyIfPlatform().length != 0 && !hasAllRequiredPlatform(irAnno.applyIfPlatform(), "applyIfPlatform")) {
             printDisableReason(m, "Constraint not met (applyIfPlatform)", irAnno.applyIfPlatform(), ruleIndex, ruleMax);
             return false;
-        } else if (irAnno.applyIfPlatformAnd().length != 0 && !hasAllRequiredPlatform(irAnno.applyIfPlatformAnd())) {
+        } else if (irAnno.applyIfPlatformAnd().length != 0 && !hasAllRequiredPlatform(irAnno.applyIfPlatformAnd(), "applyIfPlatformAnd")) {
             printDisableReason(m, "Not all constraints are met (applyIfPlatformAnd)", irAnno.applyIfPlatformAnd(), ruleIndex, ruleMax);
             return false;
-        } else if (irAnno.applyIfPlatformOr().length != 0 && !hasAnyRequiredPlatform(irAnno.applyIfPlatformOr())) {
+        } else if (irAnno.applyIfPlatformOr().length != 0 && !hasAnyRequiredPlatform(irAnno.applyIfPlatformOr(), "applyIfPlatformOr")) {
             printDisableReason(m, "None of the constraints are met (applyIfPlatformOr)", irAnno.applyIfPlatformOr(), ruleIndex, ruleMax);
             return false;
-        } else if (irAnno.applyIfCPUFeature().length != 0 && !hasAllRequiredCPUFeature(irAnno.applyIfCPUFeature())) {
+        } else if (irAnno.applyIfCPUFeature().length != 0 && !hasAllRequiredCPUFeature(irAnno.applyIfCPUFeature(), "applyIfCPUFeature")) {
             printDisableReason(m, "Feature constraint not met (applyIfCPUFeature)", irAnno.applyIfCPUFeature(), ruleIndex, ruleMax);
             return false;
-        } else if (irAnno.applyIfCPUFeatureAnd().length != 0 && !hasAllRequiredCPUFeature(irAnno.applyIfCPUFeatureAnd())) {
+        } else if (irAnno.applyIfCPUFeatureAnd().length != 0 && !hasAllRequiredCPUFeature(irAnno.applyIfCPUFeatureAnd(), "applyIfCPUFeatureAnd")) {
             printDisableReason(m, "Not all feature constraints are met (applyIfCPUFeatureAnd)", irAnno.applyIfCPUFeatureAnd(), ruleIndex, ruleMax);
             return false;
-        } else if (irAnno.applyIfCPUFeatureOr().length != 0 && !hasAnyRequiredCPUFeature(irAnno.applyIfCPUFeatureOr())) {
+        } else if (irAnno.applyIfCPUFeatureOr().length != 0 && !hasAnyRequiredCPUFeature(irAnno.applyIfCPUFeatureOr(), "applyIfCPUFeatureOr")) {
             printDisableReason(m, "None of the feature constraints met (applyIfCPUFeatureOr)", irAnno.applyIfCPUFeatureOr(), ruleIndex, ruleMax);
             return false;
         } else if (irAnno.applyIf().length != 0 && !hasAllRequiredFlags(irAnno.applyIf(), "applyIf")) {
@@ -285,22 +286,24 @@ private boolean hasAllRequiredFlags(String[] andRules, String ruleType) {
         return returnValue;
     }
 
-    private boolean hasAllRequiredPlatform(String[] andRules) {
+    private boolean hasAllRequiredPlatform(String[] andRules, String ruleType) {
         boolean returnValue = true;
         for (int i = 0; i < andRules.length; i++) {
             String platform = andRules[i].trim();
             i++;
+            TestFormat.check(i < andRules.length, "Missing value for platform " + platform + " in " + ruleType + failAt());
             String value = andRules[i].trim();
             returnValue &= checkPlatform(platform, value);
         }
         return returnValue;
     }
 
-    private boolean hasAnyRequiredPlatform(String[] orRules) {
+    private boolean hasAnyRequiredPlatform(String[] orRules, String ruleType) {
         boolean returnValue = false;
         for (int i = 0; i < orRules.length; i++) {
             String platform = orRules[i].trim();
             i++;
+            TestFormat.check(i < orRules.length, "Missing value for platform " + platform + " in " + ruleType + failAt());
             String value = orRules[i].trim();
             returnValue |= checkPlatform(platform, value);
         }
@@ -361,22 +364,24 @@ private boolean checkPlatform(String platform, String value) {
         return (trueValue && currentPlatform.contains(platform)) || (falseValue && !currentPlatform.contains(platform));
     }
 
-    private boolean hasAllRequiredCPUFeature(String[] andRules) {
+    private boolean hasAllRequiredCPUFeature(String[] andRules, String ruleType) {
         boolean returnValue = true;
         for (int i = 0; i < andRules.length; i++) {
             String feature = andRules[i].trim();
             i++;
+            TestFormat.check(i < andRules.length, "Missing value for cpu feature " + feature + " in " + ruleType + failAt());
             String value = andRules[i].trim();
             returnValue &= checkCPUFeature(feature, value);
         }
         return returnValue;
     }
 
-    private boolean hasAnyRequiredCPUFeature(String[] orRules) {
+    private boolean hasAnyRequiredCPUFeature(String[] orRules, String ruleType) {
         boolean returnValue = false;
         for (int i = 0; i < orRules.length; i++) {
             String feature = orRules[i].trim();
             i++;
+            TestFormat.check(i < orRules.length, "Missing value for cpu feature " + feature + " in " + ruleType + failAt());
             String value = orRules[i].trim();
             returnValue |= checkCPUFeature(feature, value);
         }
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVectorFuzzer.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVectorFuzzer.java
index e27feb36e86..7526d180952 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVectorFuzzer.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVectorFuzzer.java
@@ -30,6 +30,7 @@
  * @requires vm.compiler2.enabled
  * @key randomness
  * @run main/bootclasspath/othervm -XX:+IgnoreUnrecognizedVMOptions
+ *                                 -XX:CompileCommand=MemLimit,*.*,0
  *                                 -XX:LoopUnrollLimit=250
  *                                 -XX:CompileCommand=printcompilation,compiler.loopopts.superword.TestAlignVectorFuzzer::*
  *                                 compiler.loopopts.superword.TestAlignVectorFuzzer
@@ -44,6 +45,7 @@
  * @requires vm.compiler2.enabled
  * @key randomness
  * @run main/bootclasspath/othervm -XX:+IgnoreUnrecognizedVMOptions
+ *                                 -XX:CompileCommand=MemLimit,*.*,0
  *                                 -XX:+AlignVector -XX:+VerifyAlignVector
  *                                 -XX:LoopUnrollLimit=250
  *                                 -XX:CompileCommand=printcompilation,compiler.loopopts.superword.TestAlignVectorFuzzer::*
@@ -60,6 +62,7 @@
  * @requires vm.bits == 64
  * @key randomness
  * @run main/bootclasspath/othervm -XX:+IgnoreUnrecognizedVMOptions
+ *                                 -XX:CompileCommand=MemLimit,*.*,0
  *                                 -XX:+AlignVector -XX:+VerifyAlignVector
  *                                 -XX:LoopUnrollLimit=250
  *                                 -XX:CompileCommand=printcompilation,compiler.loopopts.superword.TestAlignVectorFuzzer::*
@@ -76,6 +79,7 @@
  * @requires vm.compiler2.enabled
  * @key randomness
  * @run main/bootclasspath/othervm -XX:+IgnoreUnrecognizedVMOptions
+ *                                 -XX:CompileCommand=MemLimit,*.*,0
  *                                 -XX:+AlignVector -XX:+VerifyAlignVector
  *                                 -XX:LoopUnrollLimit=250
  *                                 -XX:CompileCommand=printcompilation,compiler.loopopts.superword.TestAlignVectorFuzzer::*
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegment.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegment.java
new file mode 100644
index 00000000000..02197d94a51
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegment.java
@@ -0,0 +1,810 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.loopopts.superword;
+
+import compiler.lib.ir_framework.*;
+import jdk.test.lib.Utils;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Random;
+import java.lang.foreign.*;
+
+/*
+ * @test id=byte-array
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment ByteArray
+ */
+
+/*
+ * @test id=char-array
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment CharArray
+ */
+
+/*
+ * @test id=short-array
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment ShortArray
+ */
+
+/*
+ * @test id=int-array
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment IntArray
+ */
+
+/*
+ * @test id=long-array
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment LongArray
+ */
+
+/*
+ * @test id=float-array
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment FloatArray
+ */
+
+/*
+ * @test id=double-array
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment DoubleArray
+ */
+
+/*
+ * @test id=byte-buffer
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment ByteBuffer
+ */
+
+/*
+ * @test id=byte-buffer-direct
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment ByteBufferDirect
+ */
+
+/*
+ * @test id=native
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment Native
+ */
+
+// FAILS: mixed providers currently do not vectorize. Maybe there is some inlining issue.
+// /*
+//  * @test id=mixed-array
+//  * @bug 8329273
+//  * @summary Test vectorization of loops over MemorySegment
+//  * @library /test/lib /
+//  * @run driver compiler.loopopts.superword.TestMemorySegment MixedArray
+//  */
+//
+// /*
+//  * @test id=MixedBuffer
+//  * @bug 8329273
+//  * @summary Test vectorization of loops over MemorySegment
+//  * @library /test/lib /
+//  * @run driver compiler.loopopts.superword.TestMemorySegment MixedBuffer
+//  */
+//
+// /*
+//  * @test id=mixed
+//  * @bug 8329273
+//  * @summary Test vectorization of loops over MemorySegment
+//  * @library /test/lib /
+//  * @run driver compiler.loopopts.superword.TestMemorySegment Mixed
+//  */
+
+public class TestMemorySegment {
+    public static void main(String[] args) {
+        TestFramework framework = new TestFramework(TestMemorySegmentImpl.class);
+        framework.addFlags("-DmemorySegmentProviderNameForTestVM=" + args[0]);
+        framework.setDefaultWarmup(100);
+        framework.start();
+    }
+}
+
+class TestMemorySegmentImpl {
+    static final int BACKING_SIZE = 1024 * 8;
+    static final Random RANDOM = Utils.getRandomInstance();
+
+
+    interface TestFunction {
+        Object[] run();
+    }
+
+    interface MemorySegmentProvider {
+        MemorySegment newMemorySegment();
+    }
+
+    static MemorySegmentProvider provider;
+
+    static {
+        String providerName = System.getProperty("memorySegmentProviderNameForTestVM");
+        provider = switch (providerName) {
+            case "ByteArray"        -> TestMemorySegmentImpl::newMemorySegmentOfByteArray;
+            case "CharArray"        -> TestMemorySegmentImpl::newMemorySegmentOfCharArray;
+            case "ShortArray"       -> TestMemorySegmentImpl::newMemorySegmentOfShortArray;
+            case "IntArray"         -> TestMemorySegmentImpl::newMemorySegmentOfIntArray;
+            case "LongArray"        -> TestMemorySegmentImpl::newMemorySegmentOfLongArray;
+            case "FloatArray"       -> TestMemorySegmentImpl::newMemorySegmentOfFloatArray;
+            case "DoubleArray"      -> TestMemorySegmentImpl::newMemorySegmentOfDoubleArray;
+            case "ByteBuffer"       -> TestMemorySegmentImpl::newMemorySegmentOfByteBuffer;
+            case "ByteBufferDirect" -> TestMemorySegmentImpl::newMemorySegmentOfByteBufferDirect;
+            case "Native"           -> TestMemorySegmentImpl::newMemorySegmentOfNative;
+            case "MixedArray"       -> TestMemorySegmentImpl::newMemorySegmentOfMixedArray;
+            case "MixedBuffer"      -> TestMemorySegmentImpl::newMemorySegmentOfMixedBuffer;
+            case "Mixed"            -> TestMemorySegmentImpl::newMemorySegmentOfMixed;
+            default -> throw new RuntimeException("Test argument not recognized: " + providerName);
+        };
+    }
+
+    // List of tests
+    Map<String, TestFunction> tests = new HashMap<>();
+
+    // List of gold, the results from the first run before compilation
+    Map<String, Object[]> golds = new HashMap<>();
+
+    public TestMemorySegmentImpl () {
+        // Generate two MemorySegments as inputs
+        MemorySegment a = newMemorySegment();
+        MemorySegment b = newMemorySegment();
+        fillRandom(a);
+        fillRandom(b);
+
+        // Add all tests to list
+        tests.put("testMemorySegmentBadExitCheck",                 () -> testMemorySegmentBadExitCheck(copy(a)));
+        tests.put("testIntLoop_iv_byte",                           () -> testIntLoop_iv_byte(copy(a)));
+        tests.put("testIntLoop_longIndex_intInvar_sameAdr_byte",   () -> testIntLoop_longIndex_intInvar_sameAdr_byte(copy(a), 0));
+        tests.put("testIntLoop_longIndex_longInvar_sameAdr_byte",  () -> testIntLoop_longIndex_longInvar_sameAdr_byte(copy(a), 0));
+        tests.put("testIntLoop_longIndex_intInvar_byte",           () -> testIntLoop_longIndex_intInvar_byte(copy(a), 0));
+        tests.put("testIntLoop_longIndex_longInvar_byte",          () -> testIntLoop_longIndex_longInvar_byte(copy(a), 0));
+        tests.put("testIntLoop_intIndex_intInvar_byte",            () -> testIntLoop_intIndex_intInvar_byte(copy(a), 0));
+        tests.put("testIntLoop_iv_int",                            () -> testIntLoop_iv_int(copy(a)));
+        tests.put("testIntLoop_longIndex_intInvar_sameAdr_int",    () -> testIntLoop_longIndex_intInvar_sameAdr_int(copy(a), 0));
+        tests.put("testIntLoop_longIndex_longInvar_sameAdr_int",   () -> testIntLoop_longIndex_longInvar_sameAdr_int(copy(a), 0));
+        tests.put("testIntLoop_longIndex_intInvar_int",            () -> testIntLoop_longIndex_intInvar_int(copy(a), 0));
+        tests.put("testIntLoop_longIndex_longInvar_int",           () -> testIntLoop_longIndex_longInvar_int(copy(a), 0));
+        tests.put("testIntLoop_intIndex_intInvar_int",             () -> testIntLoop_intIndex_intInvar_int(copy(a), 0));
+        tests.put("testLongLoop_iv_byte",                          () -> testLongLoop_iv_byte(copy(a)));
+        tests.put("testLongLoop_longIndex_intInvar_sameAdr_byte",  () -> testLongLoop_longIndex_intInvar_sameAdr_byte(copy(a), 0));
+        tests.put("testLongLoop_longIndex_longInvar_sameAdr_byte", () -> testLongLoop_longIndex_longInvar_sameAdr_byte(copy(a), 0));
+        tests.put("testLongLoop_longIndex_intInvar_byte",          () -> testLongLoop_longIndex_intInvar_byte(copy(a), 0));
+        tests.put("testLongLoop_longIndex_longInvar_byte",         () -> testLongLoop_longIndex_longInvar_byte(copy(a), 0));
+        tests.put("testLongLoop_intIndex_intInvar_byte",           () -> testLongLoop_intIndex_intInvar_byte(copy(a), 0));
+        tests.put("testLongLoop_iv_int",                           () -> testLongLoop_iv_int(copy(a)));
+        tests.put("testLongLoop_longIndex_intInvar_sameAdr_int",   () -> testLongLoop_longIndex_intInvar_sameAdr_int(copy(a), 0));
+        tests.put("testLongLoop_longIndex_longInvar_sameAdr_int",  () -> testLongLoop_longIndex_longInvar_sameAdr_int(copy(a), 0));
+        tests.put("testLongLoop_longIndex_intInvar_int",           () -> testLongLoop_longIndex_intInvar_int(copy(a), 0));
+        tests.put("testLongLoop_longIndex_longInvar_int",          () -> testLongLoop_longIndex_longInvar_int(copy(a), 0));
+        tests.put("testLongLoop_intIndex_intInvar_int",            () -> testLongLoop_intIndex_intInvar_int(copy(a), 0));
+
+        // Compute gold value for all test methods before compilation
+        for (Map.Entry<String,TestFunction> entry : tests.entrySet()) {
+            String name = entry.getKey();
+            TestFunction test = entry.getValue();
+            Object[] gold = test.run();
+            golds.put(name, gold);
+        }
+    }
+
+    MemorySegment newMemorySegment() {
+        return provider.newMemorySegment();
+    }
+
+    MemorySegment copy(MemorySegment src) {
+        MemorySegment dst = newMemorySegment();
+        MemorySegment.copy(src, 0, dst, 0, src.byteSize());
+        return dst;
+    }
+
+    static MemorySegment newMemorySegmentOfByteArray() {
+        return MemorySegment.ofArray(new byte[BACKING_SIZE]);
+    }
+
+    static MemorySegment newMemorySegmentOfCharArray() {
+        return MemorySegment.ofArray(new char[BACKING_SIZE / 2]);
+    }
+
+    static MemorySegment newMemorySegmentOfShortArray() {
+        return MemorySegment.ofArray(new short[BACKING_SIZE / 2]);
+    }
+
+    static MemorySegment newMemorySegmentOfIntArray() {
+        return MemorySegment.ofArray(new int[BACKING_SIZE / 4]);
+    }
+
+    static MemorySegment newMemorySegmentOfLongArray() {
+        return MemorySegment.ofArray(new long[BACKING_SIZE / 8]);
+    }
+
+    static MemorySegment newMemorySegmentOfFloatArray() {
+        return MemorySegment.ofArray(new float[BACKING_SIZE / 4]);
+    }
+
+    static MemorySegment newMemorySegmentOfDoubleArray() {
+        return MemorySegment.ofArray(new double[BACKING_SIZE / 8]);
+    }
+
+    static MemorySegment newMemorySegmentOfByteBuffer() {
+        return MemorySegment.ofBuffer(ByteBuffer.allocate(BACKING_SIZE));
+    }
+
+    static MemorySegment newMemorySegmentOfByteBufferDirect() {
+        return MemorySegment.ofBuffer(ByteBuffer.allocateDirect(BACKING_SIZE));
+    }
+
+    static MemorySegment newMemorySegmentOfNative() {
+        // Auto arena: GC decides when there is no reference to the MemorySegment,
+        // and then it deallocates the backing memory.
+        return Arena.ofAuto().allocate(BACKING_SIZE, 1);
+    }
+
+    static MemorySegment newMemorySegmentOfMixedArray() {
+        switch(RANDOM.nextInt(7)) {
+            case 0  -> { return newMemorySegmentOfByteArray(); }
+            case 1  -> { return newMemorySegmentOfCharArray(); }
+            case 2  -> { return newMemorySegmentOfShortArray(); }
+            case 3  -> { return newMemorySegmentOfIntArray(); }
+            case 4  -> { return newMemorySegmentOfLongArray(); }
+            case 5  -> { return newMemorySegmentOfFloatArray(); }
+            default -> { return newMemorySegmentOfDoubleArray(); }
+        }
+    }
+
+    static MemorySegment newMemorySegmentOfMixedBuffer() {
+        switch (RANDOM.nextInt(2)) {
+            case 0  -> { return newMemorySegmentOfByteBuffer(); }
+            default -> { return newMemorySegmentOfByteBufferDirect(); }
+        }
+    }
+
+    static MemorySegment newMemorySegmentOfMixed() {
+        switch (RANDOM.nextInt(3)) {
+            case 0  -> { return newMemorySegmentOfMixedArray(); }
+            case 1  -> { return newMemorySegmentOfMixedBuffer(); }
+            default -> { return newMemorySegmentOfNative(); }
+        }
+    }
+
+    static void fillRandom(MemorySegment data) {
+        for (int i = 0; i < (int)data.byteSize(); i += 8) {
+            data.set(ValueLayout.JAVA_LONG_UNALIGNED, i, RANDOM.nextLong());
+        }
+    }
+
+
+    static void verify(String name, Object[] gold, Object[] result) {
+        if (gold.length != result.length) {
+            throw new RuntimeException("verify " + name + ": not the same number of outputs: gold.length = " +
+                                       gold.length + ", result.length = " + result.length);
+        }
+        for (int i = 0; i < gold.length; i++) {
+            Object g = gold[i];
+            Object r = result[i];
+            if (g == r) {
+                throw new RuntimeException("verify " + name + ": should be two separate objects (with identical content):" +
+                                           " gold[" + i + "] == result[" + i + "]");
+            }
+
+            if (!(g instanceof MemorySegment && r instanceof MemorySegment)) {
+                throw new RuntimeException("verify " + name + ": only MemorySegment supported, i=" + i);
+            }
+
+            MemorySegment mg = (MemorySegment)g;
+            MemorySegment mr = (MemorySegment)r;
+
+            if (mg.byteSize() != mr.byteSize()) {
+                throw new RuntimeException("verify " + name + ": MemorySegment must have same byteSize:" +
+                                       " gold[" + i + "].byteSize = " + mg.byteSize() +
+                                       " result[" + i + "].byteSize = " + mr.byteSize());
+            }
+
+            for (int j = 0; j < (int)mg.byteSize(); j++) {
+                byte vg = mg.get(ValueLayout.JAVA_BYTE, j);
+                byte vr = mr.get(ValueLayout.JAVA_BYTE, j);
+                if (vg != vr) {
+                    throw new RuntimeException("verify " + name + ": MemorySegment must have same content:" +
+                                               " gold[" + i + "][" + j + "] = " + vg +
+                                               " result[" + i + "][" + j + "] = " + vr);
+                }
+            }
+        }
+    }
+
+    @Run(test = {"testMemorySegmentBadExitCheck",
+                 "testIntLoop_iv_byte",
+                 "testIntLoop_longIndex_intInvar_sameAdr_byte",
+                 "testIntLoop_longIndex_longInvar_sameAdr_byte",
+                 "testIntLoop_longIndex_intInvar_byte",
+                 "testIntLoop_longIndex_longInvar_byte",
+                 "testIntLoop_intIndex_intInvar_byte",
+                 "testIntLoop_iv_int",
+                 "testIntLoop_longIndex_intInvar_sameAdr_int",
+                 "testIntLoop_longIndex_longInvar_sameAdr_int",
+                 "testIntLoop_longIndex_intInvar_int",
+                 "testIntLoop_longIndex_longInvar_int",
+                 "testIntLoop_intIndex_intInvar_int",
+                 "testLongLoop_iv_byte",
+                 "testLongLoop_longIndex_intInvar_sameAdr_byte",
+                 "testLongLoop_longIndex_longInvar_sameAdr_byte",
+                 "testLongLoop_longIndex_intInvar_byte",
+                 "testLongLoop_longIndex_longInvar_byte",
+                 "testLongLoop_intIndex_intInvar_byte",
+                 "testLongLoop_iv_int",
+                 "testLongLoop_longIndex_intInvar_sameAdr_int",
+                 "testLongLoop_longIndex_longInvar_sameAdr_int",
+                 "testLongLoop_longIndex_intInvar_int",
+                 "testLongLoop_longIndex_longInvar_int",
+                 "testLongLoop_intIndex_intInvar_int"})
+    void runTests() {
+        for (Map.Entry<String,TestFunction> entry : tests.entrySet()) {
+            String name = entry.getKey();
+            TestFunction test = entry.getValue();
+            // Recall gold value from before compilation
+            Object[] gold = golds.get(name);
+            // Compute new result
+            Object[] result = test.run();
+            // Compare gold and new result
+            verify(name, gold, result);
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
+                  IRNode.ADD_VB,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS
+    // Exit check: iv < long_limit      ->     (long)iv < long_limit
+    // Thus, we have an int-iv, but a long-exit-check.
+    // Is not properly recognized by either CountedLoop or LongCountedLoop
+    static Object[] testMemorySegmentBadExitCheck(MemorySegment a) {
+        for (int i = 0; i < a.byteSize(); i++) {
+            long adr = i;
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr);
+            a.set(ValueLayout.JAVA_BYTE, adr, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0",
+                  IRNode.ADD_VB,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testIntLoop_iv_byte(MemorySegment a) {
+        for (int i = 0; i < (int)a.byteSize(); i++) {
+            long adr = i;
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr);
+            a.set(ValueLayout.JAVA_BYTE, adr, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0",
+                  IRNode.ADD_VB,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testIntLoop_longIndex_intInvar_sameAdr_byte(MemorySegment a, int invar) {
+        for (int i = 0; i < (int)a.byteSize(); i++) {
+            long adr = (long)(i) + (long)(invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr);
+            a.set(ValueLayout.JAVA_BYTE, adr, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0",
+                  IRNode.ADD_VB,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testIntLoop_longIndex_longInvar_sameAdr_byte(MemorySegment a, long invar) {
+        for (int i = 0; i < (int)a.byteSize(); i++) {
+            long adr = (long)(i) + (long)(invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr);
+            a.set(ValueLayout.JAVA_BYTE, adr, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
+                  IRNode.ADD_VB,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: invariants are sorted differently, because of differently inserted Cast.
+    // See: JDK-8330274
+    static Object[] testIntLoop_longIndex_intInvar_byte(MemorySegment a, int invar) {
+        for (int i = 0; i < (int)a.byteSize(); i++) {
+            long adr1 = (long)(i) + (long)(invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr1);
+            long adr2 = (long)(i) + (long)(invar);
+            a.set(ValueLayout.JAVA_BYTE, adr2, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
+                  IRNode.ADD_VB,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: invariants are sorted differently, because of differently inserted Cast.
+    // See: JDK-8330274
+    static Object[] testIntLoop_longIndex_longInvar_byte(MemorySegment a, long invar) {
+        for (int i = 0; i < (int)a.byteSize(); i++) {
+            long adr1 = (long)(i) + (long)(invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr1);
+            long adr2 = (long)(i) + (long)(invar);
+            a.set(ValueLayout.JAVA_BYTE, adr2, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
+                  IRNode.ADD_VB,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: RangeCheck cannot be eliminated because of int_index
+    static Object[] testIntLoop_intIndex_intInvar_byte(MemorySegment a, int invar) {
+        for (int i = 0; i < (int)a.byteSize(); i++) {
+            int int_index = i + invar;
+            byte v = a.get(ValueLayout.JAVA_BYTE, int_index);
+            a.set(ValueLayout.JAVA_BYTE, int_index, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.ADD_VI,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "false"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testIntLoop_iv_int(MemorySegment a) {
+        for (int i = 0; i < (int)a.byteSize()/4; i++ ) {
+            long adr = 4L * i;
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.ADD_VI,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "false"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testIntLoop_longIndex_intInvar_sameAdr_int(MemorySegment a, int invar) {
+        for (int i = 0; i < (int)a.byteSize()/4; i++) {
+            long adr = 4L * (long)(i) + 4L * (long)(invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.ADD_VI,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "false"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testIntLoop_longIndex_longInvar_sameAdr_int(MemorySegment a, long invar) {
+        for (int i = 0; i < (int)a.byteSize()/4; i++) {
+            long adr = 4L * (long)(i) + 4L * (long)(invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
+                  IRNode.ADD_VI,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: invariants are sorted differently, because of differently inserted Cast.
+    // See: JDK-8330274
+    static Object[] testIntLoop_longIndex_intInvar_int(MemorySegment a, int invar) {
+        for (int i = 0; i < (int)a.byteSize()/4; i++) {
+            long adr1 = 4L * (long)(i) + 4L * (long)(invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr1);
+            long adr2 = 4L * (long)(i) + 4L * (long)(invar);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr2, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
+                  IRNode.ADD_VI,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: invariants are sorted differently, because of differently inserted Cast.
+    // See: JDK-8330274
+    static Object[] testIntLoop_longIndex_longInvar_int(MemorySegment a, long invar) {
+        for (int i = 0; i < (int)a.byteSize()/4; i++) {
+            long adr1 = 4L * (long)(i) + 4L * (long)(invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr1);
+            long adr2 = 4L * (long)(i) + 4L * (long)(invar);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr2, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
+                  IRNode.ADD_VI,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: RangeCheck cannot be eliminated because of int_index
+    static Object[] testIntLoop_intIndex_intInvar_int(MemorySegment a, int invar) {
+        for (int i = 0; i < (int)a.byteSize()/4; i++) {
+            int int_index = i + invar;
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, 4L * int_index);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, 4L * int_index, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0",
+                  IRNode.ADD_VB,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testLongLoop_iv_byte(MemorySegment a) {
+        for (long i = 0; i < a.byteSize(); i++) {
+            long adr = i;
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr);
+            a.set(ValueLayout.JAVA_BYTE, adr, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0",
+                  IRNode.ADD_VB,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testLongLoop_longIndex_intInvar_sameAdr_byte(MemorySegment a, int invar) {
+        for (long i = 0; i < a.byteSize(); i++) {
+            long adr = (long)(i) + (long)(invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr);
+            a.set(ValueLayout.JAVA_BYTE, adr, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0",
+                  IRNode.ADD_VB,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testLongLoop_longIndex_longInvar_sameAdr_byte(MemorySegment a, long invar) {
+        for (long i = 0; i < a.byteSize(); i++) {
+            long adr = (long)(i) + (long)(invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr);
+            a.set(ValueLayout.JAVA_BYTE, adr, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
+                  IRNode.ADD_VB,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: invariants are sorted differently, because of differently inserted Cast.
+    // See: JDK-8330274
+    static Object[] testLongLoop_longIndex_intInvar_byte(MemorySegment a, int invar) {
+        for (long i = 0; i < a.byteSize(); i++) {
+            long adr1 = (long)(i) + (long)(invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr1);
+            long adr2 = (long)(i) + (long)(invar);
+            a.set(ValueLayout.JAVA_BYTE, adr2, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
+                  IRNode.ADD_VB,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: invariants are sorted differently, because of differently inserted Cast.
+    // See: JDK-8330274
+    static Object[] testLongLoop_longIndex_longInvar_byte(MemorySegment a, long invar) {
+        for (long i = 0; i < a.byteSize(); i++) {
+            long adr1 = (long)(i) + (long)(invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr1);
+            long adr2 = (long)(i) + (long)(invar);
+            a.set(ValueLayout.JAVA_BYTE, adr2, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
+                  IRNode.ADD_VB,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: RangeCheck cannot be eliminated because of int_index
+    static Object[] testLongLoop_intIndex_intInvar_byte(MemorySegment a, int invar) {
+        for (long i = 0; i < a.byteSize(); i++) {
+            int int_index = (int)(i + invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, int_index);
+            a.set(ValueLayout.JAVA_BYTE, int_index, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.ADD_VI,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "false"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testLongLoop_iv_int(MemorySegment a) {
+        for (long i = 0; i < a.byteSize()/4; i++ ) {
+            long adr = 4L * i;
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    //@IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+    //              IRNode.ADD_VI,        "> 0",
+    //              IRNode.STORE_VECTOR,  "> 0"},
+    //    applyIfPlatform = {"64-bit", "true"},
+    //    applyIf = {"AlignVector", "false"},
+    //    applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: for native memory. I think it is because of invariants, but need investigation.
+    //        The long -> int loop conversion introduces extra invariants.
+    static Object[] testLongLoop_longIndex_intInvar_sameAdr_int(MemorySegment a, int invar) {
+        for (long i = 0; i < a.byteSize()/4; i++) {
+            long adr = 4L * (long)(i) + 4L * (long)(invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    //@IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+    //              IRNode.ADD_VI,        "> 0",
+    //              IRNode.STORE_VECTOR,  "> 0"},
+    //    applyIfPlatform = {"64-bit", "true"},
+    //    applyIf = {"AlignVector", "false"},
+    //    applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: for native memory. I think it is because of invariants, but need investigation.
+    //        The long -> int loop conversion introduces extra invariants.
+    static Object[] testLongLoop_longIndex_longInvar_sameAdr_int(MemorySegment a, long invar) {
+        for (long i = 0; i < a.byteSize()/4; i++) {
+            long adr = 4L * (long)(i) + 4L * (long)(invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
+                  IRNode.ADD_VI,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: invariants are sorted differently, because of differently inserted Cast.
+    // See: JDK-8330274
+    static Object[] testLongLoop_longIndex_intInvar_int(MemorySegment a, int invar) {
+        for (long i = 0; i < a.byteSize()/4; i++) {
+            long adr1 = 4L * (long)(i) + 4L * (long)(invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr1);
+            long adr2 = 4L * (long)(i) + 4L * (long)(invar);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr2, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
+                  IRNode.ADD_VI,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: invariants are sorted differently, because of differently inserted Cast.
+    // See: JDK-8330274
+    static Object[] testLongLoop_longIndex_longInvar_int(MemorySegment a, long invar) {
+        for (long i = 0; i < a.byteSize()/4; i++) {
+            long adr1 = 4L * (long)(i) + 4L * (long)(invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr1);
+            long adr2 = 4L * (long)(i) + 4L * (long)(invar);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr2, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
+                  IRNode.ADD_VI,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: RangeCheck cannot be eliminated because of int_index
+    static Object[] testLongLoop_intIndex_intInvar_int(MemorySegment a, int invar) {
+        for (long i = 0; i < a.byteSize()/4; i++) {
+            int int_index = (int)(i + invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, 4L * int_index);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, 4L * int_index, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java
index c65da58b285..4521d43804b 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 8310886 8325252
+ * @bug 8310886 8325252 8320622
  * @summary Test MulAddS2I vectorization.
  * @library /test/lib /
  * @run driver compiler.loopopts.superword.TestMulAddS2I
@@ -68,12 +68,8 @@ public class TestMulAddS2I {
 
 
     public static void main(String[] args) {
-        if (Platform.isX64() || Platform.isX86()) {
-            TestFramework.runWithFlags("-XX:+UseUnalignedLoadStores");
-            TestFramework.runWithFlags("-XX:-UseUnalignedLoadStores");
-        } else {
-            TestFramework.run();
-        }
+        TestFramework.runWithFlags("-XX:+AlignVector");
+        TestFramework.runWithFlags("-XX:-AlignVector");
     }
 
     @Run(test = {"testa", "testb", "testc", "testd", "teste", "testf", "testg", "testh"})
diff --git a/test/hotspot/jtreg/compiler/rangechecks/TestArrayAccessAboveRCAfterRCCastIIEliminated.java b/test/hotspot/jtreg/compiler/rangechecks/TestArrayAccessAboveRCAfterRCCastIIEliminated.java
new file mode 100644
index 00000000000..7f22db08a36
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/rangechecks/TestArrayAccessAboveRCAfterRCCastIIEliminated.java
@@ -0,0 +1,474 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8324517
+ * @summary C2: out of bound array load because of dependency on removed range check CastIIs
+ *
+ * @run main/othervm -XX:-TieredCompilation -XX:-UseOnStackReplacement -XX:-BackgroundCompilation
+ *                   -XX:CompileCommand=dontinline,TestArrayAccessAboveRCAfterRCCastIIEliminated::notInlined
+ *                   TestArrayAccessAboveRCAfterRCCastIIEliminated
+ * @run main/othervm -XX:-TieredCompilation -XX:-UseOnStackReplacement -XX:-BackgroundCompilation
+ *                   -XX:CompileCommand=dontinline,TestArrayAccessAboveRCAfterRCCastIIEliminated::notInlined
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM TestArrayAccessAboveRCAfterRCCastIIEliminated
+ * @run main/othervm TestArrayAccessAboveRCAfterRCCastIIEliminated
+ * @run main/othervm -XX:CompileCommand=dontinline,TestArrayAccessAboveRCAfterRCCastIIEliminated::notInlined
+ *                   TestArrayAccessAboveRCAfterRCCastIIEliminated
+ *
+ */
+
+public class TestArrayAccessAboveRCAfterRCCastIIEliminated {
+    private static int intField;
+    private static long longField;
+    private static volatile int volatileField;
+
+    public static void main(String[] args) {
+        int[] array = new int[100];
+        for (int i = 0; i < 20_000; i++) {
+            test1(9, 10, 1, true);
+            test1(9, 10, 1, false);
+            test2(9, 10, 1, true);
+            test2(9, 10, 1, false);
+            test3(9, 10, 1, true);
+            test3(9, 10, 1, false);
+            test4(9, 10, 1, true);
+            test4(9, 10, 1, false);
+            test5(9, 10, 1, true);
+            test5(9, 10, 1, false);
+            test6(9, 10, 1, true);
+            test6(9, 10, 1, false);
+            test7(9, 10, 1, true);
+            test7(9, 10, 1, false);
+            test8(9, 10, 1, true);
+            test8(9, 10, 1, false);
+            test9(9, 10, 1, true);
+            test9(9, 10, 1, false);
+            test10(9, 10, 1, true);
+            test10(9, 10, 1, false);
+            test11(9, 10, 1, true);
+            test11(9, 10, 1, false);
+            test12(9, 10, 1, true);
+            test12(9, 10, 1, false);
+            test13(9, 10, 1, true);
+            test13(9, 10, 1, false);
+        }
+        try {
+            test1(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test2(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test3(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test4(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test5(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test6(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test7(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test8(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test9(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test10(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test11(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test12(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test13(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+    }
+
+    private static void test1(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = array[otherArray.length];
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = array[otherArray.length];
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test2(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = 1 / (otherArray.length + 1);
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = 1 / (otherArray.length + 1);
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test3(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = 1L / (otherArray.length + 1);
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = 1L / (otherArray.length + 1);
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test4(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = 1 % (otherArray.length + 1);
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = 1 % (otherArray.length + 1);
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test5(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = 1L % (otherArray.length + 1);
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = 1L % (otherArray.length + 1);
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test6(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = 1 % (otherArray.length + 1) + 1 / (otherArray.length + 1);
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = 1 % (otherArray.length + 1) + 1 / (otherArray.length + 1);
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test7(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = 1L % (otherArray.length + 1) + 1L / (otherArray.length + 1);
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = 1L % (otherArray.length + 1) + 1L / (otherArray.length + 1);
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+    private static void test8(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = Integer.divideUnsigned(1, (otherArray.length + 1));
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = Integer.divideUnsigned(1, (otherArray.length + 1));
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test9(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = Long.divideUnsigned(1L, (otherArray.length + 1));
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = Long.divideUnsigned(1L, (otherArray.length + 1));
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test10(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = Integer.remainderUnsigned(1, (otherArray.length + 1));
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = Integer.remainderUnsigned(1, (otherArray.length + 1));
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test11(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = Long.remainderUnsigned(1L, (otherArray.length + 1));
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = Long.remainderUnsigned(1L, (otherArray.length + 1));
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test12(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = Integer.divideUnsigned(1, (otherArray.length + 1)) +
+                    Integer.remainderUnsigned(1, (otherArray.length + 1));
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = Integer.divideUnsigned(1, (otherArray.length + 1)) +
+                    Integer.remainderUnsigned(1, (otherArray.length + 1));
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test13(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = Long.remainderUnsigned(1L, (otherArray.length + 1)) +
+                    Long.divideUnsigned(1L, (otherArray.length + 1));
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = Long.remainderUnsigned(1L, (otherArray.length + 1)) +
+                    Long.divideUnsigned(1L, (otherArray.length + 1));
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void notInlined(int[] array) {
+
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloaded.java b/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloaded.java
index 23c6e83a6c5..8a1be961c80 100644
--- a/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloaded.java
+++ b/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloaded.java
@@ -31,9 +31,16 @@
  *
  * @compile TestMHUnloaded.java TestMHUnloadedHelper.java
  * @run driver jdk.test.lib.helpers.ClassFileInstaller compiler.runtime.unloaded.TestMHUnloadedHelper
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *                   -Xbatch -XX:-TieredCompilation -XX:CompileCommand=exclude,*::test
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+PrintCompilation -XX:+PrintInlining
+ *                      compiler.runtime.unloaded.TestMHUnloaded
+ *
  * @run main/othervm -Xbootclasspath/a:.
  *                   -Xbatch -XX:-TieredCompilation -XX:CompileCommand=exclude,*::test
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+PrintCompilation -XX:+PrintInlining
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+AlwaysIncrementalInline
  *                      compiler.runtime.unloaded.TestMHUnloaded
  */
 
diff --git a/test/hotspot/jtreg/compiler/splitif/TestLongCountedLoopConvL2I.java b/test/hotspot/jtreg/compiler/splitif/TestLongCountedLoopConvL2I.java
new file mode 100644
index 00000000000..957ebaf4531
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/splitif/TestLongCountedLoopConvL2I.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8331575
+ * @summary C2: crash when ConvL2I is split thru phi at LongCountedLoop
+ * @run main/othervm -XX:-BackgroundCompilation -XX:-TieredCompilation -XX:-UseOnStackReplacement
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM -XX:StressSeed=92643864 TestLongCountedLoopConvL2I
+ * @run main/othervm -XX:-BackgroundCompilation -XX:-TieredCompilation -XX:-UseOnStackReplacement
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM TestLongCountedLoopConvL2I
+ * @run main/othervm -XX:-BackgroundCompilation -XX:-TieredCompilation
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM TestLongCountedLoopConvL2I
+ */
+
+public class TestLongCountedLoopConvL2I {
+    private static volatile int volatileField;
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 20_000; i++) {
+            testHelper1(42);
+            test1(0);
+        }
+    }
+
+    private static int test1(int res) {
+        int k = 1;
+        for (; k < 2; k *= 2) {
+        }
+        long i = testHelper1(k);
+        for (; i > 0; i--) {
+            res += 42 / ((int) i);
+            for (int j = 1; j < 10; j *= 2) {
+
+            }
+        }
+        return res;
+    }
+
+    private static long testHelper1(int k) {
+        if (k == 2) {
+            return 100;
+        } else {
+            return 99;
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/splitif/TestLongCountedLoopConvL2I2.java b/test/hotspot/jtreg/compiler/splitif/TestLongCountedLoopConvL2I2.java
new file mode 100644
index 00000000000..311dbdfb19b
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/splitif/TestLongCountedLoopConvL2I2.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8331575
+ * @summary C2: crash when ConvL2I is split thru phi at LongCountedLoop
+ * @run main/othervm -Xcomp -XX:CompileOnly=TestLongCountedLoopConvL2I2.* TestLongCountedLoopConvL2I2
+ */
+
+public class TestLongCountedLoopConvL2I2 {
+    static int x = 34;
+
+    public static void main(String[] strArr) {
+        for (int i = 0; i < 2; i++) {
+            test();
+        }
+    }
+
+    static int test() {
+        int a = 5, b = 6;
+        long lArr[] = new long[2];
+
+        for (long i = 159; i > 1; i -= 3) {
+            a += 3;
+            for (int j = 1; j < 4; j++) {
+                if (a == 9) {
+                    if (x == 73) {
+                        try {
+                            b = 10 / (int) i;
+                        } catch (ArithmeticException a_e) {
+                        }
+                    }
+                }
+            }
+        }
+        return b;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java
index 74262142247..b723b349c2d 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java
@@ -35,7 +35,7 @@
  *                   -XX:+WhiteBoxAPI
  *                   compiler.vectorization.runner.ArrayShiftOpTest
  *
- * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64")
+ * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64") | (os.simpleArch == "riscv64")
  * @requires vm.compiler2.enabled
  */
 
@@ -99,6 +99,9 @@ public long[] longCombinedRotateShift() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.RSHIFT_VI, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.RSHIFT_VI, ">0"})
     public int[] intShiftLargeDistConstant() {
         int[] res = new int[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -110,6 +113,9 @@ public int[] intShiftLargeDistConstant() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.RSHIFT_VI, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.RSHIFT_VI, ">0"})
     public int[] intShiftLargeDistInvariant() {
         int[] res = new int[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -121,6 +127,9 @@ public int[] intShiftLargeDistInvariant() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.RSHIFT_VS, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.RSHIFT_VS, ">0"})
     public short[] shortShiftLargeDistConstant() {
         short[] res = new short[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -132,6 +141,9 @@ public short[] shortShiftLargeDistConstant() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.RSHIFT_VS, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.RSHIFT_VS, ">0"})
     public short[] shortShiftLargeDistInvariant() {
         short[] res = new short[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -143,6 +155,9 @@ public short[] shortShiftLargeDistInvariant() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.LSHIFT_VL, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.LSHIFT_VL, ">0"})
     public long[] longShiftLargeDistConstant() {
         long[] res = new long[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -154,6 +169,9 @@ public long[] longShiftLargeDistConstant() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.URSHIFT_VL, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.URSHIFT_VL, ">0"})
     public long[] longShiftLargeDistInvariant() {
         long[] res = new long[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -187,6 +205,9 @@ public short[] loopIndexShiftDistance() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.RSHIFT_VS, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.RSHIFT_VS, ">0"})
     public short[] vectorUnsignedShiftRight() {
         short[] res = new short[SIZE];
         for (int i = 0; i < SIZE; i++) {
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java
index e0b5da1b716..f080e29d1c3 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java
@@ -191,6 +191,9 @@ public byte[] vectorXor() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
         counts = {IRNode.LSHIFT_VB, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.LSHIFT_VB, ">0"})
     public byte[] vectorShiftLeft() {
         byte[] res = new byte[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -202,6 +205,9 @@ public byte[] vectorShiftLeft() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
         counts = {IRNode.RSHIFT_VB, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.RSHIFT_VB, ">0"})
     public byte[] vectorSignedShiftRight() {
         byte[] res = new byte[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -213,6 +219,9 @@ public byte[] vectorSignedShiftRight() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
         counts = {IRNode.RSHIFT_VB, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.RSHIFT_VB, ">0"})
     public byte[] vectorUnsignedShiftRight() {
         byte[] res = new byte[SIZE];
         for (int i = 0; i < SIZE; i++) {
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicCharOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicCharOpTest.java
index 6131e58d156..9fa53609ea2 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicCharOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicCharOpTest.java
@@ -193,6 +193,9 @@ public char[] vectorXor() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.LSHIFT_VC, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.LSHIFT_VC, ">0"})
     public char[] vectorShiftLeft() {
         char[] res = new char[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -204,6 +207,9 @@ public char[] vectorShiftLeft() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.URSHIFT_VC, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.URSHIFT_VC, ">0"})
     public char[] vectorSignedShiftRight() {
         char[] res = new char[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -215,6 +221,9 @@ public char[] vectorSignedShiftRight() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.URSHIFT_VC, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.URSHIFT_VC, ">0"})
     public char[] vectorUnsignedShiftRight() {
         char[] res = new char[SIZE];
         for (int i = 0; i < SIZE; i++) {
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java
index e848a15ffbc..5774e3b63b2 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java
@@ -200,6 +200,9 @@ public int[] vectorXor() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.LSHIFT_VI, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.LSHIFT_VI, ">0"})
     public int[] vectorShiftLeft() {
         int[] res = new int[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -211,6 +214,9 @@ public int[] vectorShiftLeft() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.RSHIFT_VI, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.RSHIFT_VI, ">0"})
     public int[] vectorSignedShiftRight() {
         int[] res = new int[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -222,6 +228,9 @@ public int[] vectorSignedShiftRight() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.URSHIFT_VI, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.URSHIFT_VI, ">0"})
     public int[] vectorUnsignedShiftRight() {
         int[] res = new int[SIZE];
         for (int i = 0; i < SIZE; i++) {
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java
index 80ebd7b64d0..c6ecac096f9 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java
@@ -36,7 +36,7 @@
  *                   -XX:+WhiteBoxAPI
  *                   compiler.vectorization.runner.BasicLongOpTest
  *
- * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64")
+ * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64") | (os.simpleArch == "riscv64")
  * @requires vm.compiler2.enabled
  */
 
@@ -192,6 +192,9 @@ public long[] vectorXor() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.LSHIFT_VL, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.LSHIFT_VL, ">0"})
     public long[] vectorShiftLeft() {
         long[] res = new long[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -203,6 +206,9 @@ public long[] vectorShiftLeft() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.RSHIFT_VL, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.RSHIFT_VL, ">0"})
     public long[] vectorSignedShiftRight() {
         long[] res = new long[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -214,6 +220,9 @@ public long[] vectorSignedShiftRight() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.URSHIFT_VL, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.URSHIFT_VL, ">0"})
     public long[] vectorUnsignedShiftRight() {
         long[] res = new long[SIZE];
         for (int i = 0; i < SIZE; i++) {
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
index 363daf3a115..bf5516ddaf8 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
@@ -191,6 +191,9 @@ public short[] vectorXor() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.LSHIFT_VS, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.LSHIFT_VS, ">0"})
     public short[] vectorShiftLeft() {
         short[] res = new short[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -202,6 +205,9 @@ public short[] vectorShiftLeft() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.RSHIFT_VS, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.RSHIFT_VS, ">0"})
     public short[] vectorSignedShiftRight() {
         short[] res = new short[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -238,6 +244,9 @@ public short[] vectorMax() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
         counts = {IRNode.RSHIFT_VS, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"v", "true"},
+        counts = {IRNode.RSHIFT_VS, ">0"})
     public short[] vectorUnsignedShiftRight() {
         short[] res = new short[SIZE];
         for (int i = 0; i < SIZE; i++) {
diff --git a/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java
index ee9a07f0adc..8d40423b5e8 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,14 +96,6 @@ public static void testAddAndRemoveCommand(CommandExecutor executor) {
             Assert.fail("Expected three directives - found " + count);
         }
 
-        // Test replacement with some directives from file
-        output = executor.execute("Compiler.directives_replace " + filename);
-        output = executor.execute("Compiler.directives_print");
-        count = find(output, "Directive:");
-        if (count != 3) {
-            Assert.fail("Expected three directives - found " + count);
-        }
-
         // Test remove one directive
         output = executor.execute("Compiler.directives_remove");
         output = executor.execute("Compiler.directives_print");
diff --git a/test/hotspot/jtreg/serviceability/dcmd/compiler/DirectivesRefreshTest.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/DirectivesRefreshTest.java
deleted file mode 100644
index 2e6882b4ac2..00000000000
--- a/test/hotspot/jtreg/serviceability/dcmd/compiler/DirectivesRefreshTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 2023, BELLSOFT. All rights reserved.
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test DirectivesRefreshTest
- * @summary Test of forced recompile after compiler directives changes by diagnostic command
- * @requires vm.compiler1.enabled & vm.compiler2.enabled
- * @library /test/lib /
- * @modules java.base/jdk.internal.misc
- *
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- *
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *                   -XX:-BackgroundCompilation
- *                   serviceability.dcmd.compiler.DirectivesRefreshTest
- */
-
-package serviceability.dcmd.compiler;
-
-import jdk.test.whitebox.WhiteBox;
-
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.dcmd.CommandExecutor;
-import jdk.test.lib.dcmd.JMXExecutor;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.lang.reflect.Method;
-import java.util.Random;
-
-import static jdk.test.lib.Asserts.assertEQ;
-
-import static compiler.whitebox.CompilerWhiteBoxTest.COMP_LEVEL_NONE;
-import static compiler.whitebox.CompilerWhiteBoxTest.COMP_LEVEL_SIMPLE;
-import static compiler.whitebox.CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION;
-
-public class DirectivesRefreshTest {
-
-    static Path cmdPath = Paths.get(System.getProperty("test.src", "."), "refresh_control.txt");
-    static WhiteBox wb = WhiteBox.getWhiteBox();
-    static Random random = new Random();
-
-    static Method method;
-    static CommandExecutor executor;
-
-    static int callable() {
-        int result = 0;
-        for (int i = 0; i < 100; i++) {
-            result += random.nextInt(100);
-        }
-        return result;
-    }
-
-    static void checkCompilationLevel(Method method, int level) {
-        assertEQ(wb.getMethodCompilationLevel(method), level, "Compilation level");
-    }
-
-    static void setup() throws Exception {
-        method = DirectivesRefreshTest.class.getDeclaredMethod("callable");
-        executor = new JMXExecutor();
-
-        System.out.println("Compilation with C2");
-
-        // Happens with fairly hot methods.
-        wb.enqueueMethodForCompilation(method, COMP_LEVEL_FULL_OPTIMIZATION);
-        checkCompilationLevel(method, COMP_LEVEL_FULL_OPTIMIZATION);
-    }
-
-    static void testDirectivesAddRefresh() {
-        System.out.println("Force forbid C2 via directive, method deoptimized");
-
-        var output = executor.execute("Compiler.directives_add -r " + cmdPath.toString());
-        output.stderrShouldBeEmpty().shouldContain("1 compiler directives added");
-        // Current handling of 'Exclude' for '-r' clears flags.
-        checkCompilationLevel(method, COMP_LEVEL_NONE);
-
-        System.out.println("C2 is excluded, re-compilation with C1");
-
-        // Sanity check for the directive.
-        wb.enqueueMethodForCompilation(method, COMP_LEVEL_FULL_OPTIMIZATION);
-        checkCompilationLevel(method, COMP_LEVEL_NONE);
-
-        // Happens with fairly hot methods.
-        wb.enqueueMethodForCompilation(method, COMP_LEVEL_SIMPLE);
-        checkCompilationLevel(method, COMP_LEVEL_SIMPLE);
-    }
-
-    static void testDirectivesClearRefresh() {
-        System.out.println("Re-compilation with C2 due to removed restriction");
-
-        var output = executor.execute("Compiler.directives_clear -r");
-        output.stderrShouldBeEmpty().stdoutShouldBeEmpty();
-
-        // No need to enqueue the method, "immediate" effect of '-r' without deoptimization.
-        checkCompilationLevel(method, COMP_LEVEL_FULL_OPTIMIZATION);
-    }
-
-    static void testDirectivesAddRegular() {
-        System.out.println("No changes if the restriction is not forced");
-
-        // According to original JEP 165, the directive will be handled
-        // "when a method is submitted for a compilation".
-        var output = executor.execute("Compiler.directives_add " + cmdPath.toString());
-        output.stderrShouldBeEmpty().shouldContain("1 compiler directives added");
-
-        // In this program the method is not called, and here it is not enqueued.
-        checkCompilationLevel(method, COMP_LEVEL_FULL_OPTIMIZATION);
-    }
-
-    public static void main(String[] args) throws Exception {
-        setup();
-        testDirectivesAddRefresh();
-        testDirectivesClearRefresh();
-        testDirectivesAddRegular();
-    }
-}
diff --git a/test/hotspot/jtreg/serviceability/dcmd/compiler/refresh_control.txt b/test/hotspot/jtreg/serviceability/dcmd/compiler/refresh_control.txt
deleted file mode 100644
index d6bcb91a11a..00000000000
--- a/test/hotspot/jtreg/serviceability/dcmd/compiler/refresh_control.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-  {
-    match: "serviceability.dcmd.compiler.DirectivesRefreshTest::callable",
-    c2: {
-      Exclude: true
-    }
-  }
-]
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java
index e6d7e740202..b1badcc533f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -147,7 +147,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         String expectedPlugAttachConnectorName = "PlugAttachConnector001_Name";
         String expectedPlugAttachConnectorDescription = "PlugAttachConnector001_Description";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java
index 18cf8cd4c7b..7c0f8fc8310 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -165,7 +165,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         String checkedPlugAttachConnectorName = "PlugAttachConnector002_Name";
         String checkedPlugAttachConnectorDescription = "PlugAttachConnector002_Description";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java
index b6314aeb390..0bc4527ecf9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,7 +133,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java
index daa70d305aa..096e6b970af 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -149,7 +149,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         String expectedPlugLaunchConnectorName = "PlugLaunchConnector001_Name";
         String expectedPlugLaunchConnectorDescription = "PlugLaunchConnector001_Description";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java
index d395320250a..71c0cc2987e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -165,7 +165,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         String checkedPlugLaunchConnectorName = "PlugLaunchConnector002_Name";
         String checkedPlugLaunchConnectorDescription = "PlugLaunchConnector002_Description";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java
index 53aa59f9c6b..2f5898dfd86 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,7 +133,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java
index 2f21e2a359e..bab07c442dd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -149,7 +149,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         String expectedPlugListenConnectorName = "PlugListenConnector001_Name";
         String expectedPlugListenConnectorDescription = "PlugListenConnector001_Description";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java
index 407c3781394..2861c75491f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -165,7 +165,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         String checkedPlugListenConnectorName = "PlugListenConnector002_Name";
         String checkedPlugListenConnectorDescription = "PlugListenConnector002_Description";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java
index 34b4587dacb..300af2f6851 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,7 +133,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java
index 720cd845b41..250b30a9472 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -176,7 +176,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java
index 8fd40809fee..b5f63b7e2ef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -201,7 +201,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java
index 376cdbe7087..6e883c779ac 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -214,7 +214,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java
index 64a810a17b2..00b57cb6731 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -233,7 +233,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java
index 4b13ad99001..577cdd23f9d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -238,7 +238,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java
index 88f44940ffa..e753a3656fe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -263,7 +263,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java
index ff68a83cbff..bf090ce7fa7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -185,7 +185,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/TransportService/transportService001 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java
index 6a1bb9f78a1..370b5dbd7b3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -185,7 +185,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/TransportService/transportService002 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java
index 7716bdd8aae..889942922b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -136,7 +136,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/TransportService/transportService003 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001.java
index 92b85582c68..20b473062b3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001.java
@@ -158,7 +158,6 @@ private int runThis (String argv[], PrintStream out) {
         argsHandler = new ArgumentHandler(argv);
         verboseMode = argsHandler.verbose();
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/ReferenceType/genericSignature/genericSignature001 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001a.java
index dd41eab3ddc..42c738fa86e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -113,7 +113,6 @@ public static void main (String argv[]) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(System.err, argsHandler);
-        logHandler.enableErrorsSummary(false);
         IOPipe pipe = argsHandler.createDebugeeIOPipe();
 
         logOnVerbose(infoLogPrefixHead + "Debugee started!");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002.java
index 07d8da57c92..781b0f6f4ba 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002.java
@@ -140,7 +140,6 @@ private int runThis (String argv[], PrintStream out) {
         argsHandler = new ArgumentHandler(argv);
         verboseMode = argsHandler.verbose();
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/ReferenceType/genericSignature/genericSignature002 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002a.java
index 9be56cd362f..2caa90e0a92 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,7 +86,6 @@ public static void main (String argv[]) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(System.err, argsHandler);
-        logHandler.enableErrorsSummary(false);
         IOPipe pipe = argsHandler.createDebugeeIOPipe();
 
         logOnVerbose(infoLogPrefixHead + "Debugee started!");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001.java
index c23ff079c0e..d5368568bec 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001.java
@@ -183,7 +183,6 @@ private int runThis (String argv[], PrintStream out) {
         argsHandler = new ArgumentHandler(argv);
         verboseMode = argsHandler.verbose();
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/TypeComponent/genericSignature/genericSignature001 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001a.java
index 6fe6f41c89f..e479baa584b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -112,7 +112,6 @@ public static void main (String argv[]) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(System.err, argsHandler);
-        logHandler.enableErrorsSummary(false);
         IOPipe pipe = argsHandler.createDebugeeIOPipe();
 
         logOnVerbose(infoLogPrefixHead + "Debugee started!");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002.java
index cb596163da1..8eabd51f713 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002.java
@@ -175,7 +175,6 @@ private int runThis (String argv[], PrintStream out) {
         argsHandler = new ArgumentHandler(argv);
         verboseMode = argsHandler.verbose();
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/TypeComponent/genericSignature/genericSignature002 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002a.java
index de3b50167c1..476393e39cb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -288,7 +288,6 @@ public static void main (String argv[]) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(System.err, argsHandler);
-        logHandler.enableErrorsSummary(false);
         IOPipe pipe = argsHandler.createDebugeeIOPipe();
 
         logOnVerbose(infoLogPrefixHead + "Debugee started!");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001.java
index 5b0363f9dd4..26ad37078d8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001.java
@@ -94,7 +94,6 @@ private int runThis (String argv[], PrintStream out) {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/Log.java b/test/hotspot/jtreg/vmTestbase/nsk/share/Log.java
index 6bdc5266fc4..735f487f6c3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/Log.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/Log.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,9 +56,6 @@
  * Error messages appeares in log stream in all modes. Additional log massages,
  * printed with <code>display()</code> method will be filtered out, if log mode
  * is not verbose. In verbose log made messages of both types are printed.
- * Additionally, in verbose mode a summary of all occured errors will be printed
- * at the program exit, by automatically invoking method
- * <code>printErrorsSummary()</code>.
  * <p>
  * To provide printing messages from different sources into one log
  * with distinct prefixes use internal <code>Log.Logger</code> class.
@@ -69,14 +66,11 @@
  * @see ArgumentParser
  * @see Log.Logger
  */
-public class Log extends FinalizableObject {
+public class Log {
     /**
      * Report step-by-step activity to this stream.
-     *
-     * @deprecated  Tests should not use this field directly.
      */
-    @Deprecated
-    protected PrintStream out = null;
+    private PrintStream out = null;
 
     /**
      * Is log-mode verbose?
@@ -114,7 +108,7 @@ public static final class TraceLevel {
 
         public static int nameToLevel(String value) throws IllegalArgumentException {
             Integer level = NAME_TO_LEVEL_MAP.get(value.toLowerCase());
-            if ( level == null )
+           if ( level == null )
                 throw new IllegalArgumentException("Wrong trace level: " + value);
 
             return level;
@@ -135,16 +129,6 @@ public static String getLevelsString() {
      */
     private int traceLevel = TraceLevel.DEFAULT;
 
-    /**
-     * Is printing errors summary enabled? Default value is <code>true</code>;
-     */
-    private boolean errorsSummaryEnabled = true;
-
-    /**
-     * Is printing saved verbose messages on error enabled? Default value is <code>true</code>;
-     */
-    private boolean verboseOnErrorEnabled = true;
-
     /**
      * This <code>errosBuffer</code> will keep all messages printed via
      * <code>complain()</code> method for final summary output.
@@ -188,8 +172,6 @@ public static String getLevelsString() {
      */
     @Deprecated
     protected Log() {
-        // install finalizer to print errors summary at exit
-        registerCleanup();
         // Don't log exceptions from this method. It would just add unnecessary logs.
         loggedExceptions.add("nsk.share.jdi.SerialExecutionDebugger.executeTests");
     }
@@ -234,34 +216,6 @@ public boolean verbose() {
         return verbose;
     }
 
-    /**
-     * Return <i>true</i> if printing errors summary at exit is enabled.
-     */
-    public boolean isErrorsSummaryEnabled() {
-        return errorsSummaryEnabled;
-    }
-
-    /**
-     * Enable or disable printing errors summary at exit.
-     */
-    public void enableErrorsSummary(boolean enable) {
-        errorsSummaryEnabled = enable;
-    }
-
-    /**
-     * Return <i>true</i> if printing saved verbose messages on error is enabled.
-     */
-    public boolean isVerboseOnErrorEnabled() {
-        return errorsSummaryEnabled;
-    }
-
-    /**
-     * Enable or disable printing saved verbose messages on error.
-     */
-    public void enableVerboseOnError(boolean enable) {
-        verboseOnErrorEnabled = enable;
-    }
-
     /**
      * Enable or disable verbose mode for printing messages.
      */
@@ -315,7 +269,7 @@ public static String printExceptionToString(Object prefix, Throwable exception)
     @Deprecated
     public synchronized void println(String message) {
         doPrint(message);
-        if (!verbose() && isVerboseOnErrorEnabled()) {
+        if (!verbose()) {
             keepLog(composeLine(message));
         }
     }
@@ -371,10 +325,8 @@ public void trace(int level, Object message, Throwable exception) {
     public synchronized void display(Object message) {
         if (verbose()) {
             doPrint(message.toString());
-        } else if (isVerboseOnErrorEnabled()) {
-            keepLog(composeLine(message.toString()));
         } else {
-            // ignore
+            keepLog(composeLine(message.toString()));
         }
     }
 
@@ -384,7 +336,7 @@ public synchronized void display(Object message) {
      * into <code>errorsBuffer</code>.
      */
     public synchronized void complain(Object message) {
-        if (!verbose() && isVerboseOnErrorEnabled()) {
+        if (!verbose()) {
             PrintStream stream = findOutStream();
             stream.println("#>  ");
             stream.println("#>  WARNING: switching log to verbose mode,");
@@ -395,9 +347,6 @@ public synchronized void complain(Object message) {
         }
         String msgStr = message.toString();
         printError(msgStr);
-        if (isErrorsSummaryEnabled()) {
-            keepError(msgStr);
-        }
 
         logExceptionForFailureAnalysis(msgStr);
     }
@@ -469,7 +418,9 @@ private void logExceptionForFailureAnalysis(String msg) {
      */
     @Deprecated
     protected synchronized void logTo(PrintStream stream) {
-        cleanup(); // flush older log stream
+        if (out != null) {
+            out.flush();
+        }
         out = stream;
         verbose = true;
     }
@@ -573,59 +524,6 @@ private synchronized void keepLog(String message) {
         logBuffer.addElement(message);
     }
 
-    /**
-     * Keep the given error <code>message</code> into <code>errorsBuffer</code>.
-     */
-    private synchronized void keepError(String message) {
-        errorsBuffer.addElement(message);
-    }
-
-    /**
-     * Print errors messages summary from errors buffer if any;
-     * print a warning message first.
-     */
-    private synchronized void printErrorsSummary() {
-        if (errorsBuffer.size() <= 0)
-            return;
-
-        PrintStream stream = findOutStream();
-        stream.println();
-        stream.println();
-        stream.println("#>  ");
-        stream.println("#>  SUMMARY: Following errors occured");
-        stream.println("#>      during test execution:");
-        stream.println("#>  ");
-        stream.flush();
-
-        for (Enumeration e = errorsBuffer.elements(); e.hasMoreElements(); ) {
-            printError((String) e.nextElement());
-        }
-    }
-
-    /**
-     * Print errors summary if mode is verbose, flush and cancel output stream.
-     *
-     * This is replacement of the finalize() method and is called when this
-     * Log instance becomes unreachable.
-     *
-     */
-    @Override
-    public void cleanup() {
-        if (verbose() && isErrorsSummaryEnabled()) {
-            printErrorsSummary();
-        }
-        if (out != null)
-            out.flush();
-        out = null;
-    }
-
-    /**
-     * Perform finalization at the exit.
-     */
-    public void finalizeAtExit() {
-        cleanup();
-    }
-
     /**
      * This class can be used as a base for each class that use <code>Log</code>
      * for print messages and errors.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java
index 2fc76a991d5..bd57206302b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -147,8 +147,6 @@ private int runIt(String argv[], PrintStream out) {
         }
 
         log = new Log(out, argHandler);
-        log.enableErrorsSummary(false);
-        log.enableVerboseOnError(false);
         logger = new Log.Logger(log, "");
 
         registerCleanup();
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/MlvmTestExecutor.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/MlvmTestExecutor.java
index 581f8a90571..2c219309b63 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/MlvmTestExecutor.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/MlvmTestExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -235,7 +235,6 @@ private static Class<?> getTestClassFromCallerStack() {
      * @see #runMlvmTest(Class<?> testClass, Object[] constructorArgs)
      */
     public static void launch(Class<?> testClass, Object[] constructorArgs) {
-        Env.getLog().enableVerboseOnError(true);
 
         long startTime = System.currentTimeMillis();
         boolean passed;
diff --git a/test/jdk/ProblemList-Virtual.txt b/test/jdk/ProblemList-Virtual.txt
index e3b0a922857..c45353e65ed 100644
--- a/test/jdk/ProblemList-Virtual.txt
+++ b/test/jdk/ProblemList-Virtual.txt
@@ -29,9 +29,6 @@ com/sun/jdi/EATests.java#id0                                    8264699 generic-
 
 com/sun/jdi/ExceptionEvents.java 8278470 generic-all
 com/sun/jdi/RedefineCrossStart.java 8278470 generic-all
-com/sun/jdi/cds/CDSBreakpointTest.java 8307778 generic-all
-com/sun/jdi/cds/CDSDeleteAllBkptsTest.java 8307778 generic-all
-com/sun/jdi/cds/CDSFieldWatchpoints.java 8307778 generic-all
 
 javax/management/remote/mandatory/connection/BrokenConnectionTest.java 8308035 windows-x64
 
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 4ffc4bde90c..e2201e9f95c 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -669,7 +669,6 @@ javax/swing/JFileChooser/6798062/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
-javax/swing/JRadioButton/4314194/bug4314194.java 8298153 linux-all
 
 # Several tests which fail on some hidpi systems/macosx12-aarch64 system
 javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java 8274106 macosx-aarch64
diff --git a/test/jdk/com/sun/jdi/cds/CDSJDITest.java b/test/jdk/com/sun/jdi/cds/CDSJDITest.java
index 0ec201d7035..3bb6ec6ebdf 100644
--- a/test/jdk/com/sun/jdi/cds/CDSJDITest.java
+++ b/test/jdk/com/sun/jdi/cds/CDSJDITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ public static void runTest(String testname, String[] jarClasses) throws Exceptio
             // pass them to the subprocess it will create for the debuggee. This
             // is how the -javaopts are passed to the debuggee. See
             // VMConnection.getDebuggeeVMOptions().
-            getPropOpt("test.classes"),
+            getPropOpt("test.class.path"),
             getPropOpt("test.java.opts"),
             getPropOpt("test.vm.opts"),
             // Pass -showversion to the JDI test just so we get a bit of trace output.
diff --git a/test/jdk/com/sun/security/ec/ECOperationsFuzzTest.java b/test/jdk/com/sun/security/ec/ECOperationsFuzzTest.java
new file mode 100644
index 00000000000..31d83815ed8
--- /dev/null
+++ b/test/jdk/com/sun/security/ec/ECOperationsFuzzTest.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2024, Intel Corporation. All rights reserved.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.Random;
+import java.math.BigInteger;
+import java.lang.reflect.Field;
+import java.security.spec.ECParameterSpec;
+import sun.security.ec.ECOperations;
+import sun.security.util.ECUtil;
+import sun.security.util.NamedCurve;
+import sun.security.util.CurveDB;
+import sun.security.ec.point.*;
+import java.security.spec.ECPoint;
+import sun.security.util.KnownOIDs;
+import sun.security.util.math.IntegerMontgomeryFieldModuloP;
+import sun.security.util.math.intpoly.*;
+
+/*
+ * @test
+ * @key randomness
+ * @modules java.base/sun.security.ec java.base/sun.security.ec.point
+ *          java.base/sun.security.util java.base/sun.security.util.math
+ *          java.base/sun.security.util.math.intpoly
+ * @run main/othervm/timeout=1200 --add-opens
+ *      java.base/sun.security.ec=ALL-UNNAMED -XX:+UnlockDiagnosticVMOptions
+ *      -XX:-UseIntPolyIntrinsics ECOperationsFuzzTest
+ * @summary Unit test ECOperationsFuzzTest.
+ */
+
+/*
+ * @test
+ * @key randomness
+ * @modules java.base/sun.security.ec java.base/sun.security.ec.point
+ *          java.base/sun.security.util java.base/sun.security.util.math
+ *          java.base/sun.security.util.math.intpoly
+ * @run main/othervm/timeout=1200 --add-opens
+ *      java.base/sun.security.ec=ALL-UNNAMED -XX:+UnlockDiagnosticVMOptions
+ *      -XX:+UseIntPolyIntrinsics ECOperationsFuzzTest
+ * @summary Unit test ECOperationsFuzzTest.
+ */
+
+// This test case is NOT entirely deterministic, it uses a random seed for
+// pseudo-random number generator. If a failure occurs, hardcode the seed to
+// make the test case deterministic
+public class ECOperationsFuzzTest {
+    public static void main(String[] args) throws Exception {
+        // Note: it might be useful to increase this number during development
+        final int repeat = 10000;
+        test(repeat);
+        System.out.println("Fuzz Success");
+    }
+
+    private static void check(MutablePoint reference, MutablePoint testValue,
+            long seed, int iter) {
+        AffinePoint affineRef = reference.asAffine();
+        AffinePoint affine = testValue.asAffine();
+        if (!affineRef.equals(affine)) {
+            throw new RuntimeException(
+                    "Found error with seed " + seed + "at iteration " + iter);
+        }
+    }
+
+    public static void test(int repeat) throws Exception {
+        Random rnd = new Random();
+        long seed = rnd.nextLong();
+        rnd.setSeed(seed);
+
+        int keySize = 256;
+        ECParameterSpec params = ECUtil.getECParameterSpec(keySize);
+        NamedCurve curve = CurveDB.lookup(KnownOIDs.secp256r1.value());
+        ECPoint generator = curve.getGenerator();
+        BigInteger b = curve.getCurve().getB();
+        if (params == null || generator == null) {
+            throw new RuntimeException(
+                    "No EC parameters available for key size " + keySize + " bits");
+        }
+
+        ECOperations ops = ECOperations.forParameters(params).get();
+        ECOperations opsReference = new ECOperations(
+                IntegerPolynomialP256.ONE.getElement(b), P256OrderField.ONE);
+
+        boolean instanceTest1 = ops
+                .getField() instanceof IntegerMontgomeryFieldModuloP;
+        boolean instanceTest2 = opsReference
+                .getField() instanceof IntegerMontgomeryFieldModuloP;
+        if (instanceTest1 == false || instanceTest2 == true) {
+            throw new RuntimeException("Bad Initialization: ["
+                + instanceTest1 + "," + instanceTest2 + "]");
+        }
+
+        byte[] multiple = new byte[keySize / 8];
+        rnd.nextBytes(multiple);
+        multiple[keySize/8 - 1] &= 0x7f; // from opsReference.seedToScalar(multiple);
+
+        MutablePoint referencePoint = opsReference.multiply(generator, multiple);
+        MutablePoint point = ops.multiply(generator, multiple);
+        check(referencePoint, point, seed, -1);
+
+        AffinePoint refAffineGenerator = AffinePoint.fromECPoint(generator,
+                referencePoint.getField());
+        AffinePoint montAffineGenerator = AffinePoint.fromECPoint(generator,
+                point.getField());
+
+        MutablePoint refProjGenerator = new ProjectivePoint.Mutable(
+                refAffineGenerator.getX(false).mutable(),
+                refAffineGenerator.getY(false).mutable(),
+                referencePoint.getField().get1().mutable());
+
+        MutablePoint projGenerator = new ProjectivePoint.Mutable(
+                montAffineGenerator.getX(false).mutable(),
+                montAffineGenerator.getY(false).mutable(),
+                point.getField().get1().mutable());
+
+        for (int i = 0; i < repeat; i++) {
+            rnd.nextBytes(multiple);
+            multiple[keySize/8 - 1] &= 0x7f; // opsReference.seedToScalar(multiple);
+
+            MutablePoint nextReferencePoint = opsReference
+                    .multiply(referencePoint.asAffine(), multiple);
+            MutablePoint nextPoint = ops.multiply(point.asAffine().toECPoint(),
+                    multiple);
+            check(nextReferencePoint, nextPoint, seed, i);
+
+            if (rnd.nextBoolean()) {
+                opsReference.setSum(nextReferencePoint, referencePoint);
+                ops.setSum(nextPoint, point);
+                check(nextReferencePoint, nextPoint, seed, i);
+            }
+
+            if (rnd.nextBoolean()) {
+                opsReference.setSum(nextReferencePoint, refProjGenerator);
+                ops.setSum(nextPoint, projGenerator);
+                check(nextReferencePoint, nextPoint, seed, i);
+            }
+
+            if (rnd.nextInt(100) < 10) { // 10% Reset point to generator, test
+                                         // generator multiplier
+                referencePoint = opsReference.multiply(generator, multiple);
+                point = ops.multiply(generator, multiple);
+                check(referencePoint, point, seed, i);
+            } else {
+                referencePoint = nextReferencePoint;
+                point = nextPoint;
+            }
+        }
+    }
+
+}
+
+// make test TEST="test/jdk/com/sun/security/ec/ECOperationsFuzzTest.java"
\ No newline at end of file
diff --git a/test/jdk/com/sun/security/ec/ECOperationsKATTest.java b/test/jdk/com/sun/security/ec/ECOperationsKATTest.java
new file mode 100644
index 00000000000..3c98b5f63cd
--- /dev/null
+++ b/test/jdk/com/sun/security/ec/ECOperationsKATTest.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 2024, Intel Corporation. All rights reserved.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.Random;
+import java.util.List;
+import java.util.LinkedList;
+import java.math.BigInteger;
+import java.lang.reflect.Field;
+import java.security.spec.ECParameterSpec;
+import sun.security.ec.ECOperations;
+import sun.security.util.ECUtil;
+import sun.security.util.NamedCurve;
+import sun.security.util.CurveDB;
+import sun.security.ec.point.*;
+import java.security.spec.ECPoint;
+import sun.security.util.KnownOIDs;
+import sun.security.util.math.IntegerMontgomeryFieldModuloP;
+import sun.security.util.math.intpoly.*;
+
+/*
+ * @test
+ * @modules java.base/sun.security.ec java.base/sun.security.ec.point
+ *          java.base/sun.security.util java.base/sun.security.util.math
+ *          java.base/sun.security.util.math.intpoly
+ * @run main/othervm --add-opens java.base/sun.security.ec=ALL-UNNAMED
+ *      ECOperationsKATTest
+ * @summary Unit test ECOperationsKATTest.
+ */
+
+/*
+ * @test
+ * @modules java.base/sun.security.ec java.base/sun.security.ec.point
+ *          java.base/sun.security.util java.base/sun.security.util.math
+ *          java.base/sun.security.util.math.intpoly
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -Xcomp
+ *      -XX:-TieredCompilation --add-opens java.base/sun.security.ec=ALL-UNNAMED
+ *      -XX:+UnlockDiagnosticVMOptions ECOperationsKATTest
+ * @summary Unit test ECOperationsKATTest.
+ */
+
+ public class ECOperationsKATTest {
+    final private static java.util.HexFormat hex = java.util.HexFormat.of();
+
+    public static void main(String args[]) throws Exception {
+        int testsPassed = 0;
+        int testNumber = 0;
+
+        for (TestData test : testList) {
+            System.out.println("*** Test " + ++testNumber + ": " + test.testName);
+            if (runSingleTest(test)) {
+                testsPassed++;
+            }
+        }
+        System.out.println();
+
+        if (testsPassed != testNumber) {
+            throw new RuntimeException(
+                    "One or more tests failed. Check output for details");
+        }
+    }
+
+    private static boolean check(MutablePoint testValue, ECPoint reference) {
+        AffinePoint affine = testValue.asAffine();
+        BigInteger x = affine.getX().asBigInteger();
+        BigInteger y = affine.getY().asBigInteger();
+        BigInteger refX = reference.getAffineX();
+        BigInteger refY = reference.getAffineY();
+
+        if (!refX.equals(x) || !refY.equals(y)) {
+            System.out.println("ERROR - Output Mismatch!");
+            System.out.println("Expected: X: " + refX.toString(16) + " Y: "
+                    + refY.toString(16));
+            System.out.println(
+                    "Result:   X: " + x.toString(16) + " Y: " + y.toString(16));
+            return false;
+        }
+        return true;
+    }
+
+    private static class TestData {
+        public TestData(String name, String keyStr, String xStr1, String yStr1,
+                String xStr2, String yStr2) {
+            testName = name;
+            // multiplier = (new BigInteger(keyStr, 16)).toByteArray();
+            multiplier = hex.parseHex(keyStr);
+            sun.security.util.ArrayUtil.reverse(multiplier);
+            reference1 = new ECPoint(new BigInteger(xStr1, 16),
+                    new BigInteger(yStr1, 16));
+            reference2 = new ECPoint(new BigInteger(xStr2, 16),
+                    new BigInteger(yStr2, 16));
+        }
+
+        String testName;
+        byte[] multiplier;
+        ECPoint reference1; // For generator multiplier test
+        ECPoint reference2; // For non-generator multiplier test
+    }
+
+    public static final List<TestData> testList = new LinkedList<TestData>() {{
+    // (x1,y1) = mult*generator
+    // (x2,y2) = mult*mult*generator
+    add(new TestData("Test Vector #1",
+        "0000000000000000000000000000000000000000000000000000000000000012", // mult
+        "1057E0AB5780F470DEFC9378D1C7C87437BB4C6F9EA55C63D936266DBD781FDA", // x1
+        "F6F1645A15CBE5DC9FA9B7DFD96EE5A7DCC11B5C5EF4F1F78D83B3393C6A45A2", // y1
+        "4954047A366A91E3FD94E574DB6F2B04F3A8465883DBC55A816EA563BF54A324", // x2
+        "B5A54786FD9EA48C9FC38A0557B0C4D54F285908A7291B630D06BEE970F530D3") // y2
+    );
+    add(new TestData("Test Vector #2",
+        "1200000000000000000000000000000000000000000000000000000000000000", // mult
+        "DF684E6D0D57AF8B89DA11E8F7436C3D360F531D62BDCE42C5A8B72D73D5C717", // x
+        "9D3576BD03C09B8F416EE9C27D70AD4A425119271ACF549312CA48758F4E1FEC", // y
+        "57C8257EEAABF5446DCFACB99DEE104367B6C9950C76797C372EB177D5FA23B3", // x
+        "1CD3E8A34521C1C8E574EB4B99343CAA57E00725D8618F0231C7C79AA6837725") // y
+    );
+    add(new TestData("Test Vector #3",
+        "0000000000000000000000000000000120000000000000000000000000000012", // mult
+        "A69DFD47B24485E5F523BDA5FBACF03F5A7C3D22E0C2BC6705594B7B051A06D0", // x
+        "ECF19629416BE5C9AF1E30988F3AA8B803809CF4D12944EB49C5E9892723798A", // y
+        "1E28559F5B681C308632EE11A007B9891B3FD592C982C4926153795794295E58", // x
+        "3C373046C27BB34609A43C91DF6D4B9AB9EB08F3B69A8F8FAE944211D8297F30") // y
+    );
+    add(new TestData("Test Vector #4",
+        "0000000000000000000000000000000000000000000000000000000000000001", // mult
+        "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296", // x
+        "4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5", // y
+        "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296", // x
+        "4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5") // y
+    );
+    add(new TestData("Test Vector #5",
+        "EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", // mult
+        "66B71D0BD47344197CCFB0C9578EAF0ADB609E05BB4E8F87D56BD34F24EE7C47", // x
+        "14A0ECB7F708C02B2BAE238D2C4607BB9D04FCE64E10A428C911D6FA25B2F0FD", // y
+        "D25AAFD0FCC5B5E95C84C0702C138BC4D7FEB4E5F9C2DFB4301E313507EFDF44", // x
+        "F3F04EBC7D308511B0392BB7171CF92688D6484A95A8100EDFC933613A359133") // y
+    );
+    add(new TestData("Test Vector #6",
+        "1111111111111111111111111111111111111111111111111111111111111111", // mult
+        "0217E617F0B6443928278F96999E69A23A4F2C152BDF6D6CDF66E5B80282D4ED", // x
+        "194A7DEBCB97712D2DDA3CA85AA8765A56F45FC758599652F2897C65306E5794", // y
+        "A83A07D6AE918359DEBCC385DA1E416EB83417435079CA8DB06005E107C309A0", // x
+        "5AACDF816850C33EB3E54F3D0DD759B97B5E7065B2060016F73735E4A6AADE23") // y
+    );
+    }};
+
+    private static boolean runSingleTest(TestData testData) {
+        int keySize = 256;
+        ECParameterSpec params = ECUtil.getECParameterSpec(keySize);
+        NamedCurve curve = CurveDB.lookup(KnownOIDs.secp256r1.value());
+        ECPoint generator = curve.getGenerator();
+        BigInteger b = curve.getCurve().getB();
+        if (params == null || generator == null) {
+            throw new RuntimeException(
+                    "No EC parameters available for key size " + keySize + " bits");
+        }
+
+        ECOperations ops = ECOperations.forParameters(params).get();
+        ECOperations opsReference = new ECOperations(
+                IntegerPolynomialP256.ONE.getElement(b), P256OrderField.ONE);
+
+        boolean instanceTest1 = ops
+                .getField() instanceof IntegerMontgomeryFieldModuloP;
+        boolean instanceTest2 = opsReference
+                .getField() instanceof IntegerMontgomeryFieldModuloP;
+        if (instanceTest1 == false || instanceTest2 == true) {
+            throw new RuntimeException("Bad Initialization: [" + instanceTest1 + ","
+                    + instanceTest2 + "]");
+        }
+
+        MutablePoint nextPoint = ops.multiply(generator, testData.multiplier);
+        MutablePoint nextReferencePoint = opsReference.multiply(generator,
+                testData.multiplier);
+        if (!check(nextReferencePoint, testData.reference1)
+                || !check(nextPoint, testData.reference1)) {
+            return false;
+        }
+
+        nextPoint = ops.multiply(nextPoint.asAffine(), testData.multiplier);
+        nextReferencePoint = opsReference.multiply(nextReferencePoint.asAffine(),
+                testData.multiplier);
+        if (!check(nextReferencePoint, testData.reference2)
+                || !check(nextPoint, testData.reference2)) {
+            return false;
+        }
+
+        return true;
+    }
+}
+
+//make test TEST="test/jdk/com/sun/security/ec/ECOperationsKATTest.java"
+
+/*
+ * KAT generator using OpenSSL for reference vectors
+ * g++ ecpoint.cpp -g -lcrypto -Wno-deprecated-declarations && ./a.out
+ * (Some OpenSSL EC operations are marked internal i.e. deprecated)
+ *
+
+#include <openssl/obj_mac.h>
+#include <openssl/ec.h>
+
+void check(int rc, const char* locator) {
+  if (rc != 1) {
+    printf("Failed at %s\n", locator);
+    exit(55);
+  }
+}
+
+int main(){
+  BN_CTX* ctx = BN_CTX_new();
+  BIGNUM* k = BN_CTX_get(ctx);
+  BIGNUM* x1 = BN_CTX_get(ctx);
+  BIGNUM* y1 = BN_CTX_get(ctx);
+  BIGNUM* x2 = BN_CTX_get(ctx);
+  BIGNUM* y2 = BN_CTX_get(ctx);
+  EC_GROUP *ec_group = EC_GROUP_new_by_curve_name(NID_X9_62_prime256v1);
+  EC_POINT* pubkey = EC_POINT_new(ec_group);
+  EC_POINT* pubkey2 = EC_POINT_new(ec_group);
+  int rc;
+
+  rc = BN_hex2bn(&k, "1111111111111111111111111111111111111111111111111111111111111111"); //check(rc, "set raw key");
+  rc = EC_POINT_mul(ec_group, pubkey, k, NULL, NULL, ctx);  check(rc, "mult public key");
+  rc = EC_POINT_get_affine_coordinates(ec_group, pubkey, x1, y1, ctx);   check(rc, "get affine coordinates");
+  rc = EC_POINT_mul(ec_group, pubkey2, NULL, pubkey, k, ctx);  check(rc, "mult public key");
+  rc = EC_POINT_get_affine_coordinates(ec_group, pubkey2, x2, y2, ctx);   check(rc, "get affine coordinates");
+  printf("k: %s\n", BN_bn2hex(k));
+  printf("x: %s\ny: %s\n", BN_bn2hex(x1), BN_bn2hex(y1));
+  printf("x: %s\ny: %s\n", BN_bn2hex(x2), BN_bn2hex(y2));
+
+  BN_CTX_free(ctx);
+  return 0;
+}
+ */
\ No newline at end of file
diff --git a/test/jdk/com/sun/security/util/math/intpoly/IntegerPolynomialTest.java b/test/jdk/com/sun/security/util/math/intpoly/IntegerPolynomialTest.java
new file mode 100644
index 00000000000..237c0408c58
--- /dev/null
+++ b/test/jdk/com/sun/security/util/math/intpoly/IntegerPolynomialTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2024, Intel Corporation. All rights reserved.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.Random;
+import java.math.BigInteger;
+import java.util.Arrays;
+import sun.security.util.math.*;
+import sun.security.util.math.intpoly.*;
+
+/*
+ * @test
+ * @key randomness
+ * @modules java.base/sun.security.util java.base/sun.security.util.math
+ * java.base/sun.security.util.math.intpoly
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-UseIntPolyIntrinsics
+ * IntegerPolynomialTest
+ * @summary Unit test
+ * IntegerPolynomial.MutableIntegerModuloP.conditionalAssign().
+ */
+
+/*
+ * @test
+ * @key randomness
+ * @modules java.base/sun.security.util java.base/sun.security.util.math
+ * java.base/sun.security.util.math.intpoly
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -Xcomp
+ * -XX:-TieredCompilation -XX:+UseIntPolyIntrinsics IntegerPolynomialTest
+ * @summary Unit test
+ * IntegerPolynomial.MutableIntegerModuloP.conditionalAssign().
+ */
+
+// This test case is NOT entirely deterministic, it uses a random seed for
+// pseudo-random number generator. If a failure occurs, hardcode the seed to
+// make the test case deterministic
+public class IntegerPolynomialTest {
+    public static void main(String[] args) throws Exception {
+        Random rnd = new Random();
+        long seed = rnd.nextLong();
+        rnd.setSeed(seed);
+
+        IntegerPolynomial testFields[] = new IntegerPolynomial[] {
+                IntegerPolynomial1305.ONE, IntegerPolynomial25519.ONE,
+                IntegerPolynomial448.ONE, IntegerPolynomialP256.ONE,
+                MontgomeryIntegerPolynomialP256.ONE, IntegerPolynomialP384.ONE,
+                IntegerPolynomialP521.ONE,
+                new IntegerPolynomialModBinP.Curve25519OrderField(),
+                new IntegerPolynomialModBinP.Curve448OrderField(),
+                P256OrderField.ONE, P384OrderField.ONE, P521OrderField.ONE,
+                Curve25519OrderField.ONE, Curve448OrderField.ONE };
+
+        for (IntegerPolynomial field : testFields) {
+            ImmutableIntegerModuloP aRef = field
+                    .getElement(new BigInteger(32 * 64, rnd));
+            MutableIntegerModuloP a = aRef.mutable();
+            ImmutableIntegerModuloP bRef = field
+                    .getElement(new BigInteger(32 * 64, rnd));
+            MutableIntegerModuloP b = bRef.mutable();
+
+            a.conditionalSet(b, 0); // Don't assign
+            if (Arrays.equals(a.getLimbs(), b.getLimbs())) {
+                throw new RuntimeException(
+                        "[SEED " + seed + "]: Incorrect assign for " + field);
+            }
+            a.conditionalSet(b, 1); // Assign
+            if (!Arrays.equals(a.getLimbs(), b.getLimbs())) {
+                throw new RuntimeException(
+                        "[SEED " + seed + "]: Incorrect assign for " + field);
+            }
+        }
+        System.out.println("Test Success");
+    }
+}
+
+//make test TEST="test/jdk/com/sun/security/util/math/intpoly/IntegerPolynomialTest.java"
\ No newline at end of file
diff --git a/test/jdk/com/sun/security/util/math/intpoly/MontgomeryPolynomialFuzzTest.java b/test/jdk/com/sun/security/util/math/intpoly/MontgomeryPolynomialFuzzTest.java
new file mode 100644
index 00000000000..da5aa33d831
--- /dev/null
+++ b/test/jdk/com/sun/security/util/math/intpoly/MontgomeryPolynomialFuzzTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2024, Intel Corporation. All rights reserved.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.Random;
+import sun.security.util.math.IntegerMontgomeryFieldModuloP;
+import sun.security.util.math.ImmutableIntegerModuloP;
+import java.math.BigInteger;
+import sun.security.util.math.intpoly.*;
+
+/*
+ * @test
+ * @key randomness
+ * @modules java.base/sun.security.util java.base/sun.security.util.math
+ *          java.base/sun.security.util.math.intpoly
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-UseIntPolyIntrinsics
+ *      MontgomeryPolynomialFuzzTest
+ * @summary Unit test MontgomeryPolynomialFuzzTest.
+ */
+
+/*
+ * @test
+ * @key randomness
+ * @modules java.base/sun.security.util java.base/sun.security.util.math
+ *          java.base/sun.security.util.math.intpoly
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UseIntPolyIntrinsics
+ *      MontgomeryPolynomialFuzzTest
+ * @summary Unit test MontgomeryPolynomialFuzzTest.
+ */
+
+// This test case is NOT entirely deterministic, it uses a random seed for pseudo-random number generator
+// If a failure occurs, hardcode the seed to make the test case deterministic
+public class MontgomeryPolynomialFuzzTest {
+    public static void main(String[] args) throws Exception {
+        // Note: it might be useful to increase this number during development
+        final int repeat = 1000000;
+        for (int i = 0; i < repeat; i++) {
+            run();
+        }
+        System.out.println("Fuzz Success");
+    }
+
+    private static void check(BigInteger reference,
+            ImmutableIntegerModuloP testValue, long seed) {
+        if (!reference.equals(testValue.asBigInteger())) {
+            throw new RuntimeException("SEED: " + seed);
+        }
+    }
+
+    public static void run() throws Exception {
+        Random rnd = new Random();
+        long seed = rnd.nextLong();
+        rnd.setSeed(seed);
+
+        IntegerMontgomeryFieldModuloP montField = MontgomeryIntegerPolynomialP256.ONE;
+        BigInteger P = MontgomeryIntegerPolynomialP256.ONE.MODULUS;
+        BigInteger r = BigInteger.ONE.shiftLeft(260).mod(P);
+        BigInteger rInv = r.modInverse(P);
+        BigInteger aRef = (new BigInteger(P.bitLength(), rnd)).mod(P);
+
+        // Test conversion to montgomery domain
+        ImmutableIntegerModuloP a = montField.getElement(aRef);
+        aRef = aRef.multiply(r).mod(P);
+        check(aRef, a, seed);
+
+        if (rnd.nextBoolean()) {
+            aRef = aRef.multiply(aRef).multiply(rInv).mod(P);
+            a = a.multiply(a);
+            check(aRef, a, seed);
+        }
+
+        if (rnd.nextBoolean()) {
+            aRef = aRef.add(aRef).mod(P);
+            a = a.add(a);
+            check(aRef, a, seed);
+        }
+    }
+}
+
+//make test TEST="test/jdk/com/sun/security/util/math/intpoly/MontgomeryPolynomialFuzzTest.java"
\ No newline at end of file
diff --git a/test/jdk/java/awt/color/ICC_Profile/CustomCMMID.java b/test/jdk/java/awt/color/ICC_Profile/CustomCMMID.java
new file mode 100644
index 00000000000..5eb6221d39e
--- /dev/null
+++ b/test/jdk/java/awt/color/ICC_Profile/CustomCMMID.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.color.ColorSpace;
+import java.awt.color.ICC_Profile;
+import java.util.Arrays;
+
+/**
+ * @test
+ * @bug 8321489
+ * @summary tests that the cmm id is not ignored
+ */
+public final class CustomCMMID {
+
+    private static final byte[] JAVA_ID = {
+            (byte) 'j', (byte) 'a', (byte) 'v', (byte) 'a',
+    };
+
+    private static final int[] CS = {
+            ColorSpace.CS_CIEXYZ, ColorSpace.CS_GRAY, ColorSpace.CS_LINEAR_RGB,
+            ColorSpace.CS_PYCC, ColorSpace.CS_sRGB
+    };
+
+    public static void main(String[] args) {
+        for (int cs : CS) {
+            ICC_Profile p = createProfile(cs);
+            validate(p);
+        }
+    }
+
+    private static ICC_Profile createProfile(int type) {
+        byte[] data = ICC_Profile.getInstance(type).getData();
+        System.arraycopy(JAVA_ID, 0, data, ICC_Profile.icHdrCmmId,
+                         JAVA_ID.length);
+        return ICC_Profile.getInstance(data);
+    }
+
+    private static void validate(ICC_Profile p) {
+        byte[] header = p.getData(ICC_Profile.icSigHead);
+        byte[] id = new byte[JAVA_ID.length];
+        System.arraycopy(header, ICC_Profile.icHdrCmmId, id, 0, JAVA_ID.length);
+
+        if (!java.util.Arrays.equals(id, JAVA_ID)) {
+            System.err.println("Expected: " + Arrays.toString(JAVA_ID));
+            System.err.println("Actual: " + Arrays.toString(id));
+            throw new RuntimeException("Wrong cmm id");
+        }
+    }
+}
diff --git a/test/jdk/java/awt/dnd/MouseEventAfterStartDragTest/MouseEventAfterStartDragTest.java b/test/jdk/java/awt/dnd/MouseEventAfterStartDragTest/MouseEventAfterStartDragTest.java
new file mode 100644
index 00000000000..faa98c43b75
--- /dev/null
+++ b/test/jdk/java/awt/dnd/MouseEventAfterStartDragTest/MouseEventAfterStartDragTest.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.AWTEvent;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DragGestureEvent;
+import java.awt.dnd.DragGestureListener;
+import java.awt.dnd.DragSource;
+import java.awt.dnd.DragSourceAdapter;
+import java.awt.dnd.DragSourceDragEvent;
+import java.awt.dnd.DragSourceListener;
+import java.awt.event.AWTEventListener;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionAdapter;
+import java.awt.event.MouseMotionListener;
+import javax.swing.SwingUtilities;
+
+/*
+ * @test
+ * @bug 4613903
+ * @summary verifies that mouse events are not dispatched during drag
+ * @key headful
+ * @run main MouseEventAfterStartDragTest
+ */
+
+public final class MouseEventAfterStartDragTest implements AWTEventListener {
+    final Frame frame = new Frame();
+    volatile Point srcPoint;
+    volatile Dimension d;
+    volatile MouseEvent lastMouseEvent = null;
+    volatile boolean passed = true;
+    final DragSource dragSource = DragSource.getDefaultDragSource();
+    final Transferable transferable = new StringSelection("TEXT");
+
+    final MouseMotionListener mouseMotionListener = new MouseMotionAdapter() {
+        public void mouseDragged(MouseEvent e) {
+            System.out.println("mouseDragged: " + e
+                    + ", hash:" + e.hashCode());
+            if (lastMouseEvent != null && !e.equals(lastMouseEvent)) {
+                System.out.println("Unexpected: " + e
+                        + ", hash:" + e.hashCode());
+                passed = false;
+            }
+        }
+    };
+
+    final DragSourceListener dragSourceListener = new DragSourceAdapter() {
+        public void dragDropEnd(DragSourceDragEvent dsde) {
+            System.out.println("dragDropEnd: " + dsde);
+            lastMouseEvent = null;
+        }
+    };
+
+    final DragGestureListener dragGestureListener = new DragGestureListener() {
+        public void dragGestureRecognized(DragGestureEvent dge) {
+            System.out.println("dragGestureRecognized: " + dge);
+            Object[] events = dge.toArray();
+            Object lastEvent = events[events.length - 1];
+            if (lastEvent instanceof MouseEvent) {
+                lastMouseEvent = (MouseEvent) lastEvent;
+            }
+            System.out.println("The last mouse event: " + lastMouseEvent
+                    + ", hash:" + lastMouseEvent.hashCode());
+            dge.startDrag(null, transferable, dragSourceListener);
+        }
+    };
+
+    static final Object SYNC_LOCK = new Object();
+    static final int MOUSE_RELEASE_TIMEOUT = 1000;
+    volatile Component clickedComponent = null;
+
+    public static void main(String[] args) throws Exception {
+        System.setProperty("awt.dnd.drag.threshold", "0");
+        MouseEventAfterStartDragTest app = new MouseEventAfterStartDragTest();
+        try {
+            app.createAndShowGUI();
+            app.test();
+        } finally {
+            app.dispose();
+        }
+    }
+
+    public void createAndShowGUI() throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            frame.setTitle("Test frame");
+            frame.setBounds(100, 100, 200, 200);
+            frame.setLocationRelativeTo(null);
+            frame.addMouseMotionListener(mouseMotionListener);
+            dragSource.createDefaultDragGestureRecognizer(frame, DnDConstants.ACTION_COPY_OR_MOVE,
+                    dragGestureListener);
+
+            frame.getToolkit().addAWTEventListener(this, AWTEvent.MOUSE_EVENT_MASK);
+            frame.setVisible(true);
+        });
+    }
+
+    public static int sign(int n) {
+        return n < 0 ? -1 : n == 0 ? 0 : 1;
+    }
+
+    public void test() throws Exception {
+        final Robot robot = new Robot();
+        robot.setAutoDelay(45);
+        robot.waitForIdle();
+
+        SwingUtilities.invokeAndWait(() -> {
+            srcPoint = frame.getLocationOnScreen();
+            d = frame.getSize();
+        });
+        srcPoint.translate(d.width / 2, d.height / 2);
+
+        if (!pointInComponent(robot, srcPoint, frame)) {
+            System.err.println("WARNING: Couldn't locate source frame.");
+            return;
+        }
+
+        final Point dstPoint = new Point(srcPoint);
+        dstPoint.translate(d.width / 4, d.height / 4);
+
+        if (!pointInComponent(robot, dstPoint, frame)) {
+            System.err.println("WARNING: Couldn't locate target frame.");
+            return;
+        }
+
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.mouseMove(srcPoint.x, srcPoint.y);
+        robot.delay(250);
+        System.out.println("srcPoint = " + srcPoint);
+        for (; !srcPoint.equals(dstPoint);
+                srcPoint.translate(sign(dstPoint.x - srcPoint.x),
+                sign(dstPoint.y - srcPoint.y))) {
+            robot.mouseMove(srcPoint.x, srcPoint.y);
+            System.out.println("srcPoint = " + srcPoint);
+        }
+
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+        System.out.println("done");
+        robot.waitForIdle();
+        robot.delay(MOUSE_RELEASE_TIMEOUT);
+
+        if (!passed) {
+            throw new RuntimeException("Test failed");
+        }
+    }
+
+    public void dispose() throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            if (frame != null) {
+                frame.dispose();
+            }
+        });
+    }
+
+    public void reset() {
+        clickedComponent = null;
+    }
+
+    public void eventDispatched(AWTEvent e) {
+        if (e.getID() == MouseEvent.MOUSE_RELEASED) {
+            clickedComponent = (Component) e.getSource();
+            synchronized (SYNC_LOCK) {
+                SYNC_LOCK.notifyAll();
+            }
+        }
+    }
+
+    boolean pointInComponent(Robot robot, Point p, Component comp)
+            throws InterruptedException {
+        robot.waitForIdle();
+        reset();
+        robot.mouseMove(p.x, p.y);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        synchronized (SYNC_LOCK) {
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            SYNC_LOCK.wait(MOUSE_RELEASE_TIMEOUT);
+        }
+
+        Component c = clickedComponent;
+
+        while (c != null && c != comp) {
+            c = c.getParent();
+        }
+
+        return c == comp;
+    }
+}
diff --git a/test/jdk/java/foreign/TestLayoutPaths.java b/test/jdk/java/foreign/TestLayoutPaths.java
index e6bfe8450a0..484e8f86ab5 100644
--- a/test/jdk/java/foreign/TestLayoutPaths.java
+++ b/test/jdk/java/foreign/TestLayoutPaths.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  *  This code is free software; you can redistribute it and/or modify it
@@ -36,8 +36,10 @@
 import java.lang.invoke.VarHandle;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.function.IntFunction;
+import java.util.stream.Stream;
 
 import static java.lang.foreign.MemoryLayout.PathElement.groupElement;
 import static java.lang.foreign.MemoryLayout.PathElement.sequenceElement;
@@ -311,6 +313,24 @@ public void testOffsetHandle(MemoryLayout layout, PathElement[] pathElements, lo
         assertEquals(actualByteOffset, expectedByteOffset);
     }
 
+    @Test(dataProvider = "testLayouts")
+    public void testOffsetHandleOOBIndex(MemoryLayout layout, PathElement[] pathElements, long[] indexes,
+                                 long expectedByteOffset) throws Throwable {
+        int[] badIndices = { -1, 10 };
+        MemoryLayout seqLayout = MemoryLayout.sequenceLayout(badIndices[1], layout);
+        for (int badIndex : badIndices) {
+            PathElement[] seqPathElements = new PathElement[pathElements.length + 1];
+            long[] seqIndexes = new long[indexes.length + 1];
+            System.arraycopy(pathElements, 0, seqPathElements, 1, pathElements.length);
+            System.arraycopy(indexes, 0, seqIndexes, 1, indexes.length);
+            seqPathElements[0] = PathElement.sequenceElement();
+            seqIndexes[0] = badIndex;
+            MethodHandle seqByteOffsetHandle = seqLayout.byteOffsetHandle(seqPathElements)
+                    .asSpreader(long[].class, seqIndexes.length);
+            assertThrows(IndexOutOfBoundsException.class, () -> seqByteOffsetHandle.invoke(0L, seqIndexes));
+        }
+    }
+
     @Test
     public void testHashCodeCollision() {
         PathElement sequenceElement = PathElement.sequenceElement();
diff --git a/test/jdk/java/io/Console/LocaleTest.java b/test/jdk/java/io/Console/LocaleTest.java
new file mode 100644
index 00000000000..1fe725a3ab4
--- /dev/null
+++ b/test/jdk/java/io/Console/LocaleTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.File;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.List;
+import java.util.Locale;
+
+import jdk.test.lib.process.ProcessTools;
+
+/**
+ * @test
+ * @bug 8330276
+ * @summary Tests Console methods that have Locale as an argument
+ * @library /test/lib
+ * @modules jdk.internal.le jdk.localedata
+ */
+public class LocaleTest {
+    private static Calendar TODAY  = new GregorianCalendar(2024, Calendar.APRIL, 22);
+    private static String FORMAT = "%1$tY-%1$tB-%1$te %1$tA";
+    // We want to limit the expected strings within US-ASCII charset, as
+    // the native encoding is determined as such, which is used by
+    // the `Process` class under jtreg environment.
+    private static List<String> EXPECTED = List.of(
+        String.format(Locale.UK, FORMAT, TODAY),
+        String.format(Locale.FRANCE, FORMAT, TODAY),
+        String.format(Locale.GERMANY, FORMAT, TODAY),
+        String.format(Locale.of("es"), FORMAT, TODAY),
+        String.format((Locale)null, FORMAT, TODAY),
+        String.format((Locale)null, FORMAT, TODAY),
+        String.format((Locale)null, FORMAT, TODAY),
+        String.format((Locale)null, FORMAT, TODAY)
+    );
+
+    public static void main(String... args) throws Throwable {
+        if (args.length == 0) {
+            // no arg will launch the child process that actually perform tests
+            var pb = ProcessTools.createTestJavaProcessBuilder(
+                    "LocaleTest", "dummy");
+            var input = new File(System.getProperty("test.src", "."), "input.txt");
+            pb.redirectInput(input);
+            var oa = ProcessTools.executeProcess(pb);
+            if (oa.getExitValue() == -1) {
+                System.out.println("System.console() returns null. Ignoring the test.");
+            } else {
+                var output = oa.asLines();
+                var resultText =
+                    """
+                    Actual output: %s
+                    Expected output: %s
+                    """.formatted(output, EXPECTED);
+                if (!output.equals(EXPECTED)) {
+                    throw new RuntimeException("Standard out had unexpected strings:\n" + resultText);
+                } else {
+                    oa.shouldHaveExitValue(0);
+                    System.out.println("Formatting with explicit Locale succeeded.\n" + resultText);
+                }
+            }
+        } else {
+            var con = System.console();
+            if (con != null) {
+                // tests these additional methods that take a Locale
+                con.format(Locale.UK, FORMAT, TODAY);
+                con.printf("\n");
+                con.printf(Locale.FRANCE, FORMAT, TODAY);
+                con.printf("\n");
+                con.readLine(Locale.GERMANY, FORMAT, TODAY);
+                con.printf("\n");
+                con.readPassword(Locale.of("es"), FORMAT, TODAY);
+                con.printf("\n");
+
+                // tests null locale
+                con.format((Locale)null, FORMAT, TODAY);
+                con.printf("\n");
+                con.printf((Locale)null, FORMAT, TODAY);
+                con.printf("\n");
+                con.readLine((Locale)null, FORMAT, TODAY);
+                con.printf("\n");
+                con.readPassword((Locale)null, FORMAT, TODAY);
+            } else {
+                // Exit with -1
+                System.exit(-1);
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/io/Serializable/serialProxy/SerialProxyClassNotFound.java b/test/jdk/java/io/Serializable/serialProxy/SerialProxyClassNotFound.java
new file mode 100644
index 00000000000..f441c82c3f9
--- /dev/null
+++ b/test/jdk/java/io/Serializable/serialProxy/SerialProxyClassNotFound.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.test.lib.util.SerializationUtils;
+import jdk.test.lib.hexdump.HexPrinter;
+import jdk.test.lib.hexdump.ObjectStreamPrinter;
+
+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.fail;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.util.Map;
+import java.util.stream.Stream;
+
+/*
+ * @test
+ * @bug 8331224
+ * @summary Test missing class throws CNFE before creating record or setting class fields
+ * @library /test/lib
+ * @run junit SerialProxyClassNotFound
+ */
+
+/**
+ * Verify the correct exception (CNFE) is thrown when the class is not found during
+ * deserialization. Field values for objects should result in CNFE *before* creating the
+ * record or initializing the fields of a class.
+ * The issue is exposed by the use of serialization proxy classes; the proxies
+ * typically have types that are different from the original object type and
+ * result in ClassCastException.
+ */
+public class SerialProxyClassNotFound implements Serializable {
+
+    private static Stream<Arguments> Cases() {
+        return Stream.of(
+                Arguments.of(new Record1(Map.of("aaa", new XX()))), // Map uses serial proxy
+                Arguments.of(new Class2(Map.of("bbb", new XX()))),  // Map uses serial proxy
+                Arguments.of(new Record4(new Class3(new XX()))),       // Class3 uses serial proxy
+                Arguments.of(new Class5(new Class3(new XX()))),        // Class3 uses serial proxy
+                Arguments.of(new Class6(new Class3(new XX())))         // Class3 uses serial proxy
+        );
+    }
+    @ParameterizedTest
+    @MethodSource("Cases")
+    void checkForCNFE(Object obj) throws ClassNotFoundException, IOException {
+        // A record with field containing a Map with an entry for a class that is not found
+        byte[] bytes = SerializationUtils.serialize(obj);
+
+        // Scan bytes looking for "$XX"; replace all occurrences
+        boolean replaced = false;
+        for (int off = 0; off < bytes.length - 3; off++) {
+            if (bytes[off] == '$' && bytes[off + 1] == 'X' && bytes[off + 2] == 'X') {
+                // Modify bytes to change name of class to SerialProxyClassNotFound$YY
+                bytes[off + 1] = 'Y';
+                bytes[off + 2] = 'Y';
+                replaced = true;
+            }
+        }
+        if (!replaced) {
+            // Not found, Debug dump the bytes to locate the index of the XX class name
+            HexPrinter.simple()
+                    .formatter(ObjectStreamPrinter.formatter())
+                    .dest(System.err)
+                    .format(bytes);
+            fail("'$XX' of `SerialProxyClassNotFound$XX` not found in serialized bytes ");
+        }
+
+        try {
+            Object o = SerializationUtils.deserialize(bytes);
+            System.out.println("Deserialized obj: " + o);
+            HexPrinter.simple()
+                    .formatter(ObjectStreamPrinter.formatter())
+                    .dest(System.err)
+                    .format(bytes);
+            fail("deserialize should have thrown ClassNotFoundException");
+        } catch (ClassNotFoundException cnfe) {
+            assertEquals(cnfe.getMessage(),
+                    "SerialProxyClassNotFound$YY",
+                    "CNFE message incorrect");
+        } catch (IOException ioe) {
+            HexPrinter.simple()
+                    .formatter(ObjectStreamPrinter.formatter())
+                    .dest(System.err)
+                    .format(bytes);
+            throw ioe;
+        }
+    }
+
+    // A class with a readily identifiable name
+    static class XX implements Serializable { }
+
+    // A record holding a Map holding a reference to a readily identifiable (but deleted) class
+    record Record1(Map<String,XX> arg) implements Serializable {};
+
+    // Class holding a Map holding a reference to a (deleted) class
+    static class Class2 implements Serializable {
+        Map<String, XX> arg;
+        Class2(Map<String,XX> arg) {
+            this.arg = arg;
+        }
+        public String toString() {
+            return "Class2[arg=" + arg + "]";
+        }
+    }
+
+    // Class3 a holder of a reference to a class that will be "deleted"
+    static class Class3 implements Serializable {
+        XX arg;
+        Class3(XX arg) {
+            this.arg = arg;
+        }
+        private Object writeReplace() {
+            return new Class3Proxy(arg);
+        }
+        public String toString() {
+            return "Class3[arg=" + arg + "]";
+        }
+    }
+
+    // Serial proxy for Class3
+    record Class3Proxy(XX arg) implements Serializable {
+        private Object readResolve() {
+            return new Class3(arg);
+        }
+    }
+
+    // Record holding a Class3
+    record Record4(Class3 arg) implements Serializable {}
+
+    // Holder class without custom readObject
+    // Causes !hasSpecialReadMethod path through OIS.readSerialData
+    static class Class5 implements Serializable {
+        Class3 arg;
+        Class5(Class3 arg) {
+            this.arg = arg;
+        }
+        public String toString() {
+            return "Class5[arg=" + arg + "]";
+        }
+    }
+
+    // Holder class with custom readObject
+    // Causes hasSpecialReadMethod path taken through OIS.readSerialData
+    static class Class6 implements Serializable {
+        Class3 arg;
+        Class6(Class3 arg) {
+            this.arg = arg;
+        }
+        private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
+            ois.defaultReadObject();
+        }
+        public String toString() {
+            return "Class6[arg=" + arg + "]";
+        }
+    }
+
+}
diff --git a/test/jdk/java/lang/StackWalker/TestBCI.java b/test/jdk/java/lang/StackWalker/TestBCI.java
index c7d3a332ce1..3cba0505e9c 100644
--- a/test/jdk/java/lang/StackWalker/TestBCI.java
+++ b/test/jdk/java/lang/StackWalker/TestBCI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,18 @@
  * @test
  * @bug 8140450
  * @summary Basic test for the StackWalker::getByteCodeIndex method
- * @modules jdk.jdeps/com.sun.tools.classfile
+ * @enablePreview
  * @run main TestBCI
  */
 
-import com.sun.tools.classfile.Attribute;
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.Code_attribute;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.Descriptor;
-import com.sun.tools.classfile.LineNumberTable_attribute;
-import com.sun.tools.classfile.Method;
-
 import java.lang.StackWalker.StackFrame;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Arrays;
+import java.lang.classfile.Attributes;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.MethodModel;
+import java.lang.constant.MethodTypeDesc;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
@@ -66,12 +62,12 @@ public static void main(String... args) throws Exception {
 
     private final Map<String, MethodInfo> methods;
     private final Class<?> clazz;
-    TestBCI(Class<?> c) throws ConstantPoolException, IOException {
+    TestBCI(Class<?> c) throws IllegalArgumentException, IOException {
         Map<String, MethodInfo> methods;
         String filename = c.getName().replace('.', '/') + ".class";
         try (InputStream in = c.getResourceAsStream(filename)) {
-            ClassFile cf = ClassFile.read(in);
-            methods = Arrays.stream(cf.methods)
+            var cf = ClassFile.of().parse(in.readAllBytes());
+            methods = cf.methods().stream()
                 .map(m -> new MethodInfo(cf, m))
                 .collect(Collectors.toMap(MethodInfo::name, Function.identity()));
         }
@@ -129,37 +125,20 @@ int m4(int i) {
     }
 
     static class MethodInfo {
-        final Method method;
+        final MethodModel method;
         final String name;
-        final String paramTypes;
-        final String returnType;
+        final MethodTypeDesc desc;
         final Map<Integer, SortedSet<Integer>> bciToLineNumbers = new HashMap<>();
-        MethodInfo(ClassFile cf, Method m) {
+        MethodInfo(ClassModel cf, MethodModel m) {
             this.method = m;
-
-            String name;
-            String paramTypes;
-            String returnType;
-            LineNumberTable_attribute.Entry[] lineNumberTable;
-            try {
-                // method name
-                name = m.getName(cf.constant_pool);
-                // signature
-                paramTypes = m.descriptor.getParameterTypes(cf.constant_pool);
-                returnType = m.descriptor.getReturnType(cf.constant_pool);
-                Code_attribute codeAttr = (Code_attribute)
-                    m.attributes.get(Attribute.Code);
-                lineNumberTable = ((LineNumberTable_attribute)
-                    codeAttr.attributes.get(Attribute.LineNumberTable)).line_number_table;
-            } catch (ConstantPoolException|Descriptor.InvalidDescriptor e) {
-                throw new RuntimeException(e);
-            }
-            this.name = name;
-            this.paramTypes = paramTypes;
-            this.returnType = returnType;
-            Arrays.stream(lineNumberTable).forEach(entry ->
-                bciToLineNumbers.computeIfAbsent(entry.start_pc, _n -> new TreeSet<>())
-                    .add(entry.line_number));
+            this.name = m.methodName().stringValue();
+            this.desc = m.methodTypeSymbol();
+            m.code().orElseThrow(() -> new IllegalArgumentException("Missing Code in " + m))
+                    .findAttribute(Attributes.LINE_NUMBER_TABLE)
+                    .orElseThrow(() -> new IllegalArgumentException("Missing LineNumberTable in " + m))
+                    .lineNumbers().forEach(entry ->
+                            bciToLineNumbers.computeIfAbsent(entry.startPc(), _ -> new TreeSet<>())
+                                    .add(entry.lineNumber()));
         }
 
         String name() {
@@ -178,7 +157,7 @@ Optional<SortedSet<Integer>> findLineNumbers(int value) {
         public String toString() {
             StringBuilder sb = new StringBuilder();
             sb.append(name);
-            sb.append(paramTypes).append(returnType).append(" ");
+            sb.append(desc.displayDescriptor()).append(" ");
             bciToLineNumbers.entrySet().stream()
                 .sorted(Map.Entry.comparingByKey())
                 .forEach(entry -> sb.append("bci:").append(entry.getKey()).append(" ")
diff --git a/test/jdk/java/lang/constant/ClassDescTest.java b/test/jdk/java/lang/constant/ClassDescTest.java
index 4c9493721d9..4d98e1283f0 100644
--- a/test/jdk/java/lang/constant/ClassDescTest.java
+++ b/test/jdk/java/lang/constant/ClassDescTest.java
@@ -237,6 +237,12 @@ public void testArrayClassDesc() throws ReflectiveOperationException {
             testBadArrayRank(ClassDesc.of("Bar"));
             testArrayRankOverflow();
         }
+        try {
+            ConstantDescs.CD_void.arrayType();
+            fail("Should throw IAE");
+        } catch (IllegalArgumentException iae) {
+            // Expected
+        }
     }
 
     public void testBadClassDescs() {
diff --git a/test/jdk/java/lang/constant/boottest/java.base/java/lang/constant/ConstantUtilsTest.java b/test/jdk/java/lang/constant/boottest/java.base/jdk/internal/constant/ConstantUtilsTest.java
similarity index 94%
rename from test/jdk/java/lang/constant/boottest/java.base/java/lang/constant/ConstantUtilsTest.java
rename to test/jdk/java/lang/constant/boottest/java.base/jdk/internal/constant/ConstantUtilsTest.java
index 12ef29273dc..f3e9619a0e1 100644
--- a/test/jdk/java/lang/constant/boottest/java.base/java/lang/constant/ConstantUtilsTest.java
+++ b/test/jdk/java/lang/constant/boottest/java.base/jdk/internal/constant/ConstantUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,8 @@
  * questions.
  */
 
-package java.lang.constant;
+package jdk.internal.constant;
 
-import java.lang.invoke.*;
 import java.lang.constant.*;
 import java.util.*;
 
@@ -35,6 +34,7 @@
  * @test
  * @bug 8303930
  * @compile ConstantUtilsTest.java
+ * @modules java.base/jdk.internal.constant
  * @run testng ConstantUtilsTest
  * @summary unit tests for methods of java.lang.constant.ConstantUtils that are not covered by other unit tests
  */
diff --git a/test/jdk/java/time/test/java/time/TestInstant.java b/test/jdk/java/time/test/java/time/TestInstant.java
index c6a3fb90683..1879334cb2a 100644
--- a/test/jdk/java/time/test/java/time/TestInstant.java
+++ b/test/jdk/java/time/test/java/time/TestInstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,16 +59,18 @@
  */
 package test.java.time;
 
+import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 
 import org.testng.annotations.Test;
 import org.testng.annotations.DataProvider;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
 
 /**
  * Test Instant.
- * @bug 8273369
+ * @bug 8273369 8331202
  */
 @Test
 public class TestInstant extends AbstractTest {
@@ -120,4 +122,33 @@ public void test_millisUntil() {
         assertEquals(Instant.MIN.until(Instant.MIN.plusSeconds(1), ChronoUnit.MILLIS), 1000L);
         assertEquals(Instant.MAX.plusSeconds(-1).until(Instant.MAX, ChronoUnit.MILLIS), 1000L);
     }
+
+    @DataProvider
+    private Object[][] provider_until_1arg() {
+        Instant t1 = Instant.ofEpochSecond(0, 10);
+        Instant t2 = Instant.ofEpochSecond(10, -20);
+        return new Object[][] {
+            {t1, t2},
+            {t2, t1},
+            {Instant.MIN, Instant.MAX},
+            {Instant.MAX, Instant.MIN},
+        };
+    }
+
+    @Test(dataProvider = "provider_until_1arg")
+    public void test_until_1arg(Instant start, Instant end) {
+        Duration result = start.until(end);
+        Duration expected = Duration.ofSeconds(end.getEpochSecond() - start.getEpochSecond(),
+                end.getNano() - start.getNano());
+        assertEquals(result, expected);
+        expected = Duration.between(start, end);
+        assertEquals(result, expected);
+    }
+
+    @Test
+    public void test_until_1arg_NPE() {
+        assertThrows(NullPointerException.class, () -> {
+            Instant.now().until(null);
+        });
+    }
 }
diff --git a/test/jdk/java/util/Calendar/CalendarLeapYearRollTest.java b/test/jdk/java/util/Calendar/CalendarLeapYearRollTest.java
new file mode 100644
index 00000000000..7058fd14f62
--- /dev/null
+++ b/test/jdk/java/util/Calendar/CalendarLeapYearRollTest.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8331851
+ * @summary confirm that Calendar.roll() works correctly with leap year calculations
+ * @run junit CalendarLeapYearRollTest
+ */
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.stream.Stream;
+
+import static java.util.Calendar.APRIL;
+import static java.util.Calendar.DATE;
+import static java.util.Calendar.DAY_OF_MONTH;
+import static java.util.Calendar.DAY_OF_WEEK;
+import static java.util.Calendar.DAY_OF_WEEK_IN_MONTH;
+import static java.util.Calendar.DAY_OF_YEAR;
+import static java.util.Calendar.FEBRUARY;
+import static java.util.Calendar.LONG;
+import static java.util.Calendar.MARCH;
+import static java.util.Calendar.MONTH;
+import static java.util.Calendar.WEEK_OF_YEAR;
+import static java.util.Calendar.YEAR;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class CalendarLeapYearRollTest {
+
+    /**
+     * 8331851 Calendar roll for leap year
+     */
+    @ParameterizedTest
+    @MethodSource("calendarRollSource")
+    public void testRollLeapYear(String testName, int calendarDate, int calendarMonth, int calendarYear,
+                                 int value, int calendarField, int expectedDate, int expectedMonth,
+                                 int expectedYear) {
+        Calendar calendar = new GregorianCalendar(calendarYear, calendarMonth, calendarDate);
+        calendar.roll(calendarField, value);
+        assertEquals(expectedDate, calendar.get(DATE), testName
+                + " Expected " + expectedDate + " of " + expectedMonth + expectedYear + " but got " + calendar.getTime());
+        assertEquals(expectedMonth, calendar.get(MONTH), testName
+                + " Expected " + expectedMonth + " but got " + calendar.getDisplayName(MONTH, LONG, Locale.getDefault()));
+        assertEquals(expectedYear, calendar.get(YEAR), testName
+                + " Expected " + expectedYear + " but got " + calendar.get(YEAR));
+    }
+
+    /**
+     * 8331851 Calendar roll up/down for leap year
+     */
+    @ParameterizedTest
+    @MethodSource("calendarRollUpDownSource")
+    public void testRollUpDownLeapYear(String testName, int calendarDate, int calendarMonth, int calendarYear,
+                                       int firstValue, int secondValue, int calendarField, int expectedDate,
+                                       int expectedMonth, int expectedYear) {
+        Calendar calendar = new GregorianCalendar(calendarYear, calendarMonth, calendarDate);
+        calendar.roll(calendarField, firstValue);
+        calendar.roll(calendarField, secondValue);
+        assertEquals(expectedDate, calendar.get(DATE), testName
+                + " Expected " + expectedDate + " of " + expectedMonth + expectedYear + " but got " + calendar.getTime());
+        assertEquals(expectedMonth, calendar.get(MONTH), testName
+                + " Expected " + expectedMonth + " but got " + calendar.getDisplayName(MONTH, LONG, Locale.getDefault()));
+        assertEquals(expectedYear, calendar.get(YEAR), testName
+                + " Expected " + expectedYear + " but got " + calendar.get(YEAR));
+    }
+
+    /**
+     * 8331851 Calendar roll boolean for leap year
+     */
+    @ParameterizedTest
+    @MethodSource("calendarBooleanRollSource")
+    public void testBooleanRollLeapYear(String testName, int calendarDate, int calendarMonth, int calendarYear,
+                                        boolean value, int calendarField, int expectedDate,
+                                        int expectedMonth, int expectedYear) {
+        Calendar calendar = new GregorianCalendar(calendarYear, calendarMonth, calendarDate);
+        calendar.roll(calendarField, value);
+        assertEquals(expectedDate, calendar.get(DATE), testName
+                + " Expected " + expectedDate + " of " + expectedMonth + expectedYear + " but got " + calendar.getTime());
+        assertEquals(expectedMonth, calendar.get(MONTH), testName
+                + " Expected " + expectedMonth + " but got " + calendar.getDisplayName(MONTH, LONG, Locale.getDefault()));
+        assertEquals(expectedYear, calendar.get(YEAR), testName
+                + " Expected " + expectedYear + " but got " + calendar.get(YEAR));
+    }
+
+    /**
+     * 8331851 Calendar month and year roll for leap/non-leap year
+     */
+    @Test
+    public void testMonthYearRollUpDownNonLeapYear() {
+        Calendar calendar = new GregorianCalendar(2024, FEBRUARY, 29);
+        calendar.roll(MONTH, 1);
+        calendar.roll(YEAR, -1);
+        calendar.roll(MONTH, -1);
+        assertEquals(28, calendar.get(DATE),
+                "testMonthYearRollUpDownNonLeapYear Expected 28th of February 2024 but got " + calendar.getTime());
+        assertEquals(FEBRUARY, calendar.get(MONTH),
+                "testMonthYearRollUpDownNonLeapYear Expected February but got " + calendar.getDisplayName(MONTH, LONG, Locale.getDefault()));
+        assertEquals(2023, calendar.get(YEAR),
+                "testMonthYearRollUpDownNonLeapYear Expected 2023 but got " + calendar.get(YEAR));
+    }
+
+    private static Stream<Arguments> calendarRollUpDownSource() {
+        return Stream.of(
+                Arguments.of("testMonthRollDownUpLeapYearReversed", 31, MARCH, 2024, -1, 1, MONTH, 29, MARCH, 2024),
+                Arguments.of("testMonthRollUpDownLeapYearReversed", 29, FEBRUARY, 2024, 1, -1, MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testYearRollUpDownLeapYear", 29, FEBRUARY, 2024, 1, -1, YEAR, 1, MARCH, 2024),
+                Arguments.of("testFourYearRollUpDownLeapYear", 29, FEBRUARY, 2024, 4, -4, YEAR, 29, FEBRUARY, 2024),
+                Arguments.of("testDayOfYearRollUpDownLeapYear", 29, FEBRUARY, 2024, 365, -365, DAY_OF_YEAR, 29, FEBRUARY, 2024),
+                Arguments.of("testDateRollUpDownLeapYear", 29, FEBRUARY, 2024, 365, -365, DATE, 29, FEBRUARY, 2024),
+                Arguments.of("testWeekOfYearRollUpDownLeapYear", 29, FEBRUARY, 2024, 52, -52, WEEK_OF_YEAR, 29, FEBRUARY, 2024),
+                Arguments.of("testDayOfMonthRollUpDownLeapYear", 29, FEBRUARY, 2024, 31, -31, DAY_OF_MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testDayOfWeekInMonthRollUpDownLeapYear", 29, FEBRUARY, 2024, 6, -6, DAY_OF_WEEK_IN_MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testDayOfWeekRollUpDownLeapYear", 29, FEBRUARY, 2024, 6, -6, DAY_OF_WEEK, 29, FEBRUARY, 2024)
+        );
+    }
+
+    private static Stream<Arguments> calendarRollSource() {
+        return Stream.of(
+                Arguments.of("testMonthRollUpLeapYear", 29, FEBRUARY, 2024, 1, MONTH, 29, MARCH, 2024),
+                Arguments.of("testOneMonthRollDownLeapYear", 31, MARCH, 2024, -1, MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testTwoMonthDownEndOfMonthLeapYear", 30, APRIL, 2024, -2, MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testTwoMonthDownSameDateLeapYear", 29, APRIL, 2024, -2, MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testFourYearRollUpLeapYear", 29, FEBRUARY, 2024, 4, YEAR, 29, FEBRUARY, 2028),
+                Arguments.of("testTwelveMonthRollDownLeapYear", 29, FEBRUARY, 2024, 12, MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testYearRollUpLeapYear", 29, FEBRUARY, 2024, 1, YEAR, 1, MARCH, 2025),
+                Arguments.of("testYearRollDownLeapYear", 29, FEBRUARY, 2024, -1, YEAR, 1, MARCH, 2023),
+                Arguments.of("testDayOfYearRollDownLeapYear", 29, FEBRUARY, 2024, -1, DAY_OF_YEAR, 28, FEBRUARY, 2024),
+                Arguments.of("testDayOfYearRollUpLeapYear", 29, FEBRUARY, 2024, 1, DAY_OF_YEAR, 1, MARCH, 2024),
+                Arguments.of("testDateRollDownLeapYear", 29, FEBRUARY, 2024, -1, DATE, 28, FEBRUARY, 2024),
+                Arguments.of("testDateRollUpLeapYear", 29, FEBRUARY, 2024, 1, DATE, 1, FEBRUARY, 2024),
+                Arguments.of("testWeekOfYearRollUpLeapYear", 29, FEBRUARY, 2024, 1, WEEK_OF_YEAR, 7, MARCH, 2024),
+                Arguments.of("testWeekOfYearRollDownLeapYear", 29, FEBRUARY, 2024, -1, WEEK_OF_YEAR, 22, FEBRUARY, 2024),
+                Arguments.of("testDayOfMonthRollUpLeapYear", 29, FEBRUARY, 2024, 1, DAY_OF_MONTH, 1, FEBRUARY, 2024),
+                Arguments.of("testDayOfMonthRollDownLeapYear", 29, FEBRUARY, 2024, -1, DAY_OF_MONTH, 28, FEBRUARY, 2024),
+                Arguments.of("testDayOfWeekInMonthRollUpLeapYear", 29, FEBRUARY, 2024, 1, DAY_OF_WEEK_IN_MONTH, 1, FEBRUARY, 2024),
+                Arguments.of("testDayOfWeekInMonthRollDownLeapYear", 29, FEBRUARY, 2024, -1, DAY_OF_WEEK_IN_MONTH, 22, FEBRUARY, 2024),
+                Arguments.of("testDayOfWeekRollUpLeapYear", 29, FEBRUARY, 2024, 1, DAY_OF_WEEK, 1, MARCH, 2024),
+                Arguments.of("testDayOfWeekRollDownLeapYear", 29, FEBRUARY, 2024, -1, DAY_OF_WEEK, 28, FEBRUARY, 2024)
+        );
+    }
+
+    private static Stream<Arguments> calendarBooleanRollSource() {
+        return Stream.of(
+                Arguments.of("testBooleanMonthRollDownLeapYear", 31, MARCH, 2024, false, MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testBooleanMonthRollUpLeapYear", 29, FEBRUARY, 2024, true, MONTH, 29, MARCH, 2024),
+                Arguments.of("testBooleanYearRollUpLeapYear", 29, FEBRUARY, 2024, true, YEAR, 1, MARCH, 2025),
+                Arguments.of("testBooleanYearRollDownLeapYear", 29, FEBRUARY, 2024, false, YEAR, 1, MARCH, 2023),
+                Arguments.of("testBooleanDayOfYearRollDownLeapYear", 29, FEBRUARY, 2024, false, DAY_OF_YEAR, 28, FEBRUARY, 2024),
+                Arguments.of("testBooleanDayOfYearRollUpLeapYear", 29, FEBRUARY, 2024, true, DAY_OF_YEAR, 1, MARCH, 2024),
+                Arguments.of("testBooleanDateRollDownLeapYear", 29, FEBRUARY, 2024, false, DATE, 28, FEBRUARY, 2024),
+                Arguments.of("testBooleanDateRollUpLeapYear", 29, FEBRUARY, 2024, true, DATE, 1, FEBRUARY, 2024),
+                Arguments.of("testBooleanWeekOfYearRollUpLeapYear", 29, FEBRUARY, 2024, true, WEEK_OF_YEAR, 7, MARCH, 2024),
+                Arguments.of("testBooleanWeekOfYearRollDownLeapYear", 29, FEBRUARY, 2024, false, WEEK_OF_YEAR, 22, FEBRUARY, 2024),
+                Arguments.of("testBooleanDayOfMonthRollUpLeapYear", 29, FEBRUARY, 2024, true, DAY_OF_MONTH, 1, FEBRUARY, 2024),
+                Arguments.of("testBooleanDayOfMonthRollDownLeapYear", 29, FEBRUARY, 2024, false, DAY_OF_MONTH, 28, FEBRUARY, 2024),
+                Arguments.of("testBooleanDayOfWeekInMonthRollUpLeapYear", 29, FEBRUARY, 2024, true, DAY_OF_WEEK_IN_MONTH, 1, FEBRUARY, 2024),
+                Arguments.of("testBooleanDayOfWeekInMonthRollDownLeapYear", 29, FEBRUARY, 2024, false, DAY_OF_WEEK_IN_MONTH, 22, FEBRUARY, 2024),
+                Arguments.of("testBooleanDayOfWeekRollUpLeapYear", 29, FEBRUARY, 2024, true, DAY_OF_WEEK, 1, MARCH, 2024),
+                Arguments.of("testBooleanDayOfWeekRollDownLeapYear", 29, FEBRUARY, 2024, false, DAY_OF_WEEK, 28, FEBRUARY, 2024)
+        );
+    }
+
+}
diff --git a/test/jdk/java/util/Random/RandomTestCoverage.java b/test/jdk/java/util/Random/RandomTestCoverage.java
index be12d188198..a0e906fbbe2 100644
--- a/test/jdk/java/util/Random/RandomTestCoverage.java
+++ b/test/jdk/java/util/Random/RandomTestCoverage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,7 +87,7 @@ static void coverRandomGenerator(RandomGenerator rng) {
         DoubleStream doubleStream4 = rng.doubles(5, 0.5, 1.0);
     }
 
-    static void checkPredicates(RandomGeneratorFactory factory) {
+    static void checkPredicates(RandomGeneratorFactory<RandomGenerator> factory) {
         RandomGenerator rng = factory.create();
         if (rng instanceof ArbitrarilyJumpableGenerator != factory.isArbitrarilyJumpable()) {
             throw new RuntimeException("isArbitrarilyJumpable failing");
@@ -156,7 +156,7 @@ static void coverOf(String name) {
         coverFactory(RandomGeneratorFactory.of(name));
     }
 
-    static void coverFactory(RandomGeneratorFactory factory) {
+    static void coverFactory(RandomGeneratorFactory<RandomGenerator> factory) {
         String name = factory.name();
         String group = factory.group();
         int stateBits = factory.stateBits();
@@ -171,8 +171,34 @@ static void coverFactory(RandomGeneratorFactory factory) {
         boolean isSplittable = factory.isSplittable();
 
         coverRandomGenerator(factory.create());
-        coverRandomGenerator(factory.create(12345L));
-        coverRandomGenerator(factory.create(new byte[] {1, 2, 3, 4, 5, 6, 7, 8}));
+        // test create(long)
+        switch (factory.name()) {
+            // SecureRandom doesn't have long constructors so we expect
+            // UnsupportedOperationException
+            case "SecureRandom" -> {
+                try {
+                    factory.create(12345L);
+                    throw new AssertionError("RandomGeneratorFactory.create(long) was expected" +
+                            "to throw UnsupportedOperationException for " + factory.name() + " but didn't");
+                } catch (UnsupportedOperationException ignored) {
+                }
+            }
+            default -> coverRandomGenerator(factory.create(12345L));
+        }
+        // test create(byte[])
+        switch (factory.name()) {
+            // these don't have byte[] constructors so we expect UnsupportedOperationException
+            case "Random",
+                 "SplittableRandom" -> {
+                try {
+                    factory.create(new byte[] {1, 2, 3, 4, 5, 6, 7, 8});
+                    throw new AssertionError("RandomGeneratorFactory.create(byte[]) was expected" +
+                            "to throw UnsupportedOperationException for " + factory.name() + " but didn't");
+                } catch (UnsupportedOperationException ignored) {
+                }
+            }
+            default -> coverRandomGenerator(factory.create(new byte[] {1, 2, 3, 4, 5, 6, 7, 8}));
+        }
     }
 
     static void coverDefaults() {
@@ -188,32 +214,35 @@ public static void main(String[] args) throws Throwable {
                     coverOf(factory.name());
                  });
         RandomGeneratorFactory.all()
-                .filter(f -> f.isStreamable())
+                .filter(RandomGeneratorFactory::isStreamable)
                 .forEach(factory -> {
                     coverStreamable((StreamableGenerator)factory.create());
                 });
         RandomGeneratorFactory.all()
-                .filter(f -> f.isSplittable())
+                .filter(RandomGeneratorFactory::isSplittable)
                 .forEach(factory -> {
                     coverSplittable((SplittableGenerator)factory.create());
                 });
         RandomGeneratorFactory.all()
-                .filter(f -> f.isJumpable())
+                .filter(RandomGeneratorFactory::isJumpable)
                 .forEach(factory -> {
                     coverJumpable((JumpableGenerator)factory.create());
                 });
         RandomGeneratorFactory.all()
-                .filter(f -> f.isLeapable())
+                .filter(RandomGeneratorFactory::isLeapable)
                 .forEach(factory -> {
                     coverLeapable((LeapableGenerator)factory.create());
                 });
         RandomGeneratorFactory.all()
-                .filter(f -> f.isArbitrarilyJumpable())
+                .filter(RandomGeneratorFactory::isArbitrarilyJumpable)
                 .forEach(factory -> {
                     coverArbitrarilyJumpable((ArbitrarilyJumpableGenerator)factory.create());
                 });
+        RandomGeneratorFactory.all()
+                .forEach(RandomTestCoverage::checkPredicates);
 
         coverRandomGenerator(new SecureRandom());
         coverRandomGenerator(ThreadLocalRandom.current());
+        coverDefaults();
     }
 }
diff --git a/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java b/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java
index 10e035df51f..8b7d69b1ef4 100644
--- a/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java
+++ b/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java
@@ -199,27 +199,40 @@ void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
         checkCompletedExceptionally(f, false, t -> assertSame(t, ex));
     }
 
+    void checkCancellationException(CancellationException thrown, String message) {
+        assertTrue(message.equals(thrown.getMessage()));
+
+        assertTrue(thrown.getCause() instanceof CancellationException);
+        assertTrue(thrown.getCause().getCause() == null);
+    }
+
     void checkCancelled(CompletableFuture<?> f) {
         long startTime = System.nanoTime();
         try {
             f.get(LONG_DELAY_MS, MILLISECONDS);
             shouldThrow();
         } catch (CancellationException success) {
+            checkCancellationException(success, "get");
         } catch (Throwable fail) { threadUnexpectedException(fail); }
         assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
 
         try {
             f.join();
             shouldThrow();
-        } catch (CancellationException success) {}
+        } catch (CancellationException success) {
+            checkCancellationException(success, "join");
+        }
         try {
             f.getNow(null);
             shouldThrow();
-        } catch (CancellationException success) {}
+        } catch (CancellationException success) {
+            checkCancellationException(success, "getNow");
+        }
         try {
             f.get();
             shouldThrow();
         } catch (CancellationException success) {
+            checkCancellationException(success, "get");
         } catch (Throwable fail) { threadUnexpectedException(fail); }
 
         assertTrue(exceptionalCompletion(f) instanceof CancellationException);
diff --git a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
index cb1c4ec4ed3..451864bcf5d 100644
--- a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
+++ b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
@@ -667,6 +667,7 @@ public static Test suite() {
         if (atLeastJava20()) {
             String[] java20TestClassNames = {
                 "ForkJoinPool20Test",
+                "SynchronousQueue20Test",
             };
             addNamedTestClasses(suite, java20TestClassNames);
         }
diff --git a/test/jdk/java/util/concurrent/tck/SynchronousQueue20Test.java b/test/jdk/java/util/concurrent/tck/SynchronousQueue20Test.java
new file mode 100644
index 00000000000..bbe3a2e98aa
--- /dev/null
+++ b/test/jdk/java/util/concurrent/tck/SynchronousQueue20Test.java
@@ -0,0 +1,95 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ * Other contributors include Andrew Wright, Jeffrey Hayes,
+ * Pat Fisher, Mike Judd.
+ */
+
+import junit.framework.Test;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
+
+public class SynchronousQueue20Test extends JSR166TestCase {
+
+    public static void main(String[] args) {
+        main(suite(), args);
+    }
+
+    public static Test suite() {
+        return newTestSuite(SynchronousQueue20Test.class);
+    }
+
+    public void testFairDoesntLeak() throws InterruptedException {
+        assertDoesntLeak(new SynchronousQueue<>(true));
+    }
+
+    public void testUnfairDoesntLeak() throws InterruptedException {
+        assertDoesntLeak(new SynchronousQueue<>(false));
+    }
+
+    private void assertDoesntLeak(SynchronousQueue<Object> queue) throws InterruptedException {
+        final int NUMBER_OF_ITEMS = 250;
+        final int ROUND_WAIT_MILLIS = 50;
+
+        class Item {}
+        final Map<Item, Void> survivors =
+                Collections.synchronizedMap(WeakHashMap.newWeakHashMap(NUMBER_OF_ITEMS));
+
+        try (var executor = Executors.newVirtualThreadPerTaskExecutor()) {
+            for(int i = 0;i < NUMBER_OF_ITEMS;++i) {
+                executor.submit(() -> {
+                    var item = new Item();
+                    survivors.put(item, null);
+                    queue.put(item);
+                    return null;
+                });
+
+                executor.submit(() -> {
+                    queue.take();
+                    return null;
+                });
+            }
+        } // Close waits until all tasks are done
+
+        while(!survivors.isEmpty()) {
+            System.gc();
+            Thread.sleep(ROUND_WAIT_MILLIS); // We don't expect interruptions
+        }
+
+        assertTrue(queue.isEmpty()); // Make sure that the queue survives until the end
+    }
+
+}
diff --git a/test/jdk/java/util/concurrent/tck/SynchronousQueueTest.java b/test/jdk/java/util/concurrent/tck/SynchronousQueueTest.java
index 7d17fac4d35..5d5c53f92e4 100644
--- a/test/jdk/java/util/concurrent/tck/SynchronousQueueTest.java
+++ b/test/jdk/java/util/concurrent/tck/SynchronousQueueTest.java
@@ -652,5 +652,4 @@ public void testNeverContainsNull() {
         assertFalse(q.contains(null));
         assertFalse(q.remove(null));
     }
-
 }
diff --git a/test/jdk/java/util/logging/LoggingDeadlock2.java b/test/jdk/java/util/logging/LoggingDeadlock2.java
index e8a0bb49d87..dbb804940e2 100644
--- a/test/jdk/java/util/logging/LoggingDeadlock2.java
+++ b/test/jdk/java/util/logging/LoggingDeadlock2.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
@@ -309,7 +309,7 @@ private static ProcessResults run(Process p) {
             errAccumulator.join();
 
             out = outAccumulator.result();
-            err = errAccumulator.result();
+            err = errAccumulator.result().replaceAll(".* VM warning:.* deprecated.*\\R", "");
         } catch (Throwable t) {
             throwable = t;
         }
diff --git a/test/jdk/java/util/zip/EntryCount64k.java b/test/jdk/java/util/zip/EntryCount64k.java
index 2dac7643de2..d8c46d22364 100644
--- a/test/jdk/java/util/zip/EntryCount64k.java
+++ b/test/jdk/java/util/zip/EntryCount64k.java
@@ -163,6 +163,6 @@ static void checkCanRead(File zipFile, int entryCount) throws Throwable {
         OutputAnalyzer a = ProcessTools.executeTestJava("-jar", zipFile.getName());
         a.shouldHaveExitValue(0);
         a.stdoutShouldMatch("\\AMain\\Z");
-        a.stderrShouldMatch("\\A\\Z");
+        a.stderrShouldMatchIgnoreDeprecatedWarnings("\\A\\Z");
     }
 }
diff --git a/test/jdk/javax/swing/JMenuBar/RightLeftOrientation.java b/test/jdk/javax/swing/JMenuBar/RightLeftOrientation.java
new file mode 100644
index 00000000000..80779c9ce1d
--- /dev/null
+++ b/test/jdk/javax/swing/JMenuBar/RightLeftOrientation.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/*
+ * @test
+ * @bug 4211731 4214512
+ * @summary
+ *     This test checks if menu bars lay out correctly when their
+ *     ComponentOrientation property is set to RIGHT_TO_LEFT. This test is
+ *     manual.  The tester is asked to compare left-to-right and
+ *     right-to-left menu bars and judge whether they are mirror images of each
+ *     other.
+ * @library /test/jdk/java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual RightLeftOrientation
+ */
+
+import java.awt.ComponentOrientation;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.ButtonGroup;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+public class RightLeftOrientation {
+
+    static JFrame ltrFrame;
+    static JFrame rtlFrame;
+
+    private static final String INSTRUCTIONS = """
+        This test checks menu bars for correct Right-To-Left Component Orientation.
+
+        You should see two frames, each containing a menu bar.
+
+        One frame will be labelled "Left To Right" and will contain
+        a menu bar with menus starting on its left side.
+        The other frame will be labelled "Right To Left" and will
+        contain a menu bar with menus starting on its right side.
+
+        The test will also contain radio buttons that can be used to set
+        the look and feel of the menu bars.
+        For each look and feel, you should compare the two menu
+        bars and make sure they are mirror images of each other. """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                 .title("RTL test Instructions")
+                 .instructions(INSTRUCTIONS)
+                 .rows((int) INSTRUCTIONS.lines().count() + 2)
+                 .columns(30)
+                 .testUI(RightLeftOrientation::createTestUI)
+                 .build()
+                 .awaitAndCheck();
+    }
+
+    private static JFrame createTestUI() {
+        JFrame frame = new JFrame("RightLeftOrientation");
+        JPanel panel = new JPanel();
+
+        ButtonGroup group = new ButtonGroup();
+        JRadioButton rb;
+        ActionListener plafChanger = new PlafChanger();
+
+        UIManager.LookAndFeelInfo[] lafInfos = UIManager.getInstalledLookAndFeels();
+        for (int i = 0; i < lafInfos.length; i++) {
+            rb = new JRadioButton(lafInfos[i].getName());
+            rb.setActionCommand(lafInfos[i].getClassName());
+            rb.addActionListener(plafChanger);
+            group.add(rb);
+            panel.add(rb);
+            if (i == 0) {
+                rb.setSelected(true);
+            }
+        }
+
+        frame.add(panel);
+
+        ltrFrame = new JFrame("Left To Right");
+        ltrFrame.setJMenuBar(createMenuBar(ComponentOrientation.LEFT_TO_RIGHT));
+        ltrFrame.setSize(400, 100);
+        ltrFrame.setLocation(new Point(10, 10));
+        ltrFrame.setVisible(true);
+
+        rtlFrame = new JFrame("Right To Left");
+        rtlFrame.setJMenuBar(createMenuBar(ComponentOrientation.RIGHT_TO_LEFT));
+        rtlFrame.setSize(400, 100);
+        rtlFrame.setLocation(new Point(10, 120));
+        rtlFrame.setVisible(true);
+        frame.pack();
+        return frame;
+    }
+
+    static class PlafChanger implements ActionListener {
+        public void actionPerformed(ActionEvent e) {
+            String lnfName = e.getActionCommand();
+
+            try {
+                UIManager.setLookAndFeel(lnfName);
+                SwingUtilities.updateComponentTreeUI(ltrFrame);
+                SwingUtilities.updateComponentTreeUI(rtlFrame);
+            }
+            catch (Exception exc) {
+                System.err.println("Could not load LookAndFeel: " + lnfName);
+            }
+
+        }
+    }
+
+
+    static JMenuBar createMenuBar(ComponentOrientation o) {
+        JMenuBar menuBar = new JMenuBar();
+        menuBar.setComponentOrientation(o);
+
+        JMenu menu = new JMenu("One");
+        menu.setComponentOrientation(o);
+        menuBar.add(menu);
+
+        menu = new JMenu("Two");
+        menu.setComponentOrientation(o);
+        menuBar.add(menu);
+
+        menu = new JMenu("Three");
+        menu.setComponentOrientation(o);
+        menuBar.add(menu);
+
+        return menuBar;
+    }
+
+}
diff --git a/test/jdk/javax/swing/JRadioButton/4314194/bug4314194.java b/test/jdk/javax/swing/JRadioButton/4314194/bug4314194.java
index 57ee1a2bb3f..c7a6b53d4f4 100644
--- a/test/jdk/javax/swing/JRadioButton/4314194/bug4314194.java
+++ b/test/jdk/javax/swing/JRadioButton/4314194/bug4314194.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -135,6 +135,10 @@ public static void main(String[] args) throws Exception {
             if (laf.getClassName().contains("Motif")) {
                 System.out.println("Skipping Motif L&F as it is deprecated");
                 continue;
+            } else if (laf.getClassName().contains("GTK")) {
+                System.out.println("GTK doesn't support color setting explicitly" +
+                        " specified by user using UIManager property.");
+                continue;
             }
             System.out.println("Testing L&F: " + laf.getClassName());
             SwingUtilities.invokeAndWait(() -> setLookAndFeel(laf));
diff --git a/test/jdk/javax/swing/JToolBar/RightLeftOrientation.java b/test/jdk/javax/swing/JToolBar/RightLeftOrientation.java
new file mode 100644
index 00000000000..8822a86f79a
--- /dev/null
+++ b/test/jdk/javax/swing/JToolBar/RightLeftOrientation.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/*
+ * @test
+ * @bug 4214514
+ * @summary
+ *     This test checks if tool bars lay out correctly when their
+ *     ComponentOrientation property is set to RIGHT_TO_LEFT. This test is
+ *     manual.  The tester is asked to compare left-to-right and
+ *     right-to-left tool bars and judge whether they are mirror images of each
+ *     other.
+ * @library /test/jdk/java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual RightLeftOrientation
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.ComponentOrientation;
+import java.awt.Container;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JToolBar;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+public class RightLeftOrientation {
+
+    static JFrame ltrFrame;
+    static JFrame rtlFrame;
+
+    private static final String INSTRUCTIONS = """
+        This test checks tool bars for correct Right-To-Left Component Orientation.
+
+        You should see two frames, each containing a tool bar.
+
+        One frame will be labelled "Left To Right" and will contain
+        a tool bar with buttons starting on its left side.
+        The other frame will be labelled "Right To Left" and will
+        contain a tool bar with buttons starting on its right side.
+
+        The test will also contain radio buttons that can be used to set
+        the look and feel of the tool bars.
+        For each look and feel, you should compare the two tool bars and
+        make sure they are mirror images of each other.
+        You should also drag the tool bars to each corner of the frame
+        to make sure the docking behavior is consistent between the two frames.""";
+
+     public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                 .title("RTL test Instructions")
+                 .instructions(INSTRUCTIONS)
+                 .rows((int) INSTRUCTIONS.lines().count() + 2)
+                 .columns(35)
+                 .testUI(RightLeftOrientation::createTestUI)
+                 .build()
+                 .awaitAndCheck();
+    }
+
+    private static JFrame createTestUI() {
+        JFrame frame = new JFrame("RightLeftOrientation");
+        JPanel panel = new JPanel();
+
+        ButtonGroup group = new ButtonGroup();
+        JRadioButton rb;
+        ActionListener plafChanger = new PlafChanger();
+
+        UIManager.LookAndFeelInfo[] lafInfos = UIManager.getInstalledLookAndFeels();
+        for (int i = 0; i < lafInfos.length; i++) {
+            rb = new JRadioButton(lafInfos[i].getName());
+            rb.setActionCommand(lafInfos[i].getClassName());
+            rb.addActionListener(plafChanger);
+            group.add(rb);
+            panel.add(rb);
+            if (i == 0) {
+                rb.setSelected(true);
+            }
+        }
+
+        frame.add(panel);
+
+        ltrFrame = new JFrame("Left To Right");
+        Container contentPane = ltrFrame.getContentPane();
+        contentPane.setLayout(new BorderLayout());
+        panel = new JPanel();
+        panel.setBackground(Color.white);
+        contentPane.add("Center",panel);
+        contentPane.add("North",
+                        createToolBar(ComponentOrientation.LEFT_TO_RIGHT));
+        ltrFrame.setSize(400, 140);
+        ltrFrame.setLocation(new Point(10, 10));
+        ltrFrame.setVisible(true);
+
+        rtlFrame = new JFrame("Right To Left");
+        contentPane = rtlFrame.getContentPane();
+        contentPane.setLayout(new BorderLayout());
+        panel = new JPanel();
+        panel.setBackground(Color.white);
+        contentPane.add("Center",panel);
+        contentPane.add("North",
+                        createToolBar(ComponentOrientation.RIGHT_TO_LEFT));
+        rtlFrame.setSize(400, 140);
+        rtlFrame.setLocation(new Point(420, 10));
+        rtlFrame.setVisible(true);
+
+        frame.pack();
+        return frame;
+    }
+
+    static class PlafChanger implements ActionListener {
+        public void actionPerformed(ActionEvent e) {
+            String lnfName = e.getActionCommand();
+
+            try {
+                UIManager.setLookAndFeel(lnfName);
+                SwingUtilities.updateComponentTreeUI(ltrFrame);
+                SwingUtilities.updateComponentTreeUI(rtlFrame);
+            }
+            catch (Exception exc) {
+                System.err.println("Could not load LookAndFeel: " + lnfName);
+            }
+
+        }
+    }
+
+
+    static JToolBar createToolBar(ComponentOrientation o) {
+        JToolBar toolBar = new JToolBar();
+        toolBar.setComponentOrientation(o);
+
+        JButton button = new JButton("One");
+        button.setComponentOrientation(o);
+        toolBar.add(button);
+
+        button = new JButton("Two");
+        button.setComponentOrientation(o);
+        toolBar.add(button);
+
+        button = new JButton("Three");
+        button.setComponentOrientation(o);
+        toolBar.add(button);
+
+        return toolBar;
+    }
+
+}
diff --git a/test/jdk/javax/swing/plaf/basic/BasicHTML/bug4248210.java b/test/jdk/javax/swing/plaf/basic/BasicHTML/bug4248210.java
new file mode 100644
index 00000000000..fddfbb28384
--- /dev/null
+++ b/test/jdk/javax/swing/plaf/basic/BasicHTML/bug4248210.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import javax.imageio.ImageIO;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.plaf.nimbus.NimbusLookAndFeel;
+import static java.awt.image.BufferedImage.TYPE_INT_RGB;
+
+/*
+ * @test
+ * @bug 4248210
+ * @key headful
+ * @summary Tests that HTML in JLabel is painted using LAF-defined
+            foreground color
+ * @run main bug4248210
+ */
+
+public class bug4248210 {
+    private static final Color labelColor = Color.red;
+
+    public static void main(String[] args) throws Exception {
+        for (UIManager.LookAndFeelInfo laf :
+                UIManager.getInstalledLookAndFeels()) {
+            if (!(laf.getName().contains("Motif") || laf.getName().contains("GTK"))) {
+                System.out.println("Testing LAF: " + laf.getName());
+                SwingUtilities.invokeAndWait(() -> test(laf));
+            }
+        }
+    }
+
+    private static void test(UIManager.LookAndFeelInfo laf) {
+        setLookAndFeel(laf);
+        if (UIManager.getLookAndFeel() instanceof NimbusLookAndFeel) {
+            // reset "basic" properties
+            UIManager.getDefaults().put("Label.foreground", null);
+            // set "synth - nimbus" properties
+            UIManager.getDefaults().put("Label[Enabled].textForeground", labelColor);
+        } else {
+            // reset "synth - nimbus" properties
+            UIManager.getDefaults().put("Label[Enabled].textForeground", null);
+            // set "basic" properties
+            UIManager.getDefaults().put("Label.foreground", labelColor);
+        }
+
+        JLabel label = new JLabel("<html><body>Can You Read This?</body></html>");
+        label.setSize(150, 30);
+
+        BufferedImage img = paintToImage(label);
+        if (!chkImgForegroundColor(img)) {
+            try {
+                ImageIO.write(img, "png", new File("Label_" + laf.getName() + ".png"));
+            } catch (IOException ignored) {}
+            throw new RuntimeException("JLabel not painted with LAF defined " +
+                    "foreground color");
+        }
+        System.out.println("Test Passed");
+    }
+
+    private static void setLookAndFeel(UIManager.LookAndFeelInfo laf) {
+        try {
+            UIManager.setLookAndFeel(laf.getClassName());
+        } catch (UnsupportedLookAndFeelException ignored) {
+            System.out.println("Unsupported LAF: " + laf.getClassName());
+        } catch (ClassNotFoundException | InstantiationException
+                 | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static BufferedImage paintToImage(JComponent content) {
+        BufferedImage im = new BufferedImage(content.getWidth(), content.getHeight(),
+                TYPE_INT_RGB);
+        Graphics2D g = (Graphics2D) im.getGraphics();
+        g.setBackground(Color.WHITE);
+        g.clearRect(0, 0, content.getWidth(), content.getHeight());
+        content.paint(g);
+        g.dispose();
+        return im;
+    }
+
+    private static boolean chkImgForegroundColor(BufferedImage img) {
+        for (int x = 0; x < img.getWidth(); ++x) {
+            for (int y = 0; y < img.getHeight(); ++y) {
+                if (img.getRGB(x, y) == labelColor.getRGB()) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/test/jdk/jdk/classfile/LimitsTest.java b/test/jdk/jdk/classfile/LimitsTest.java
index 8a8d8bddc35..a94a56ce33f 100644
--- a/test/jdk/jdk/classfile/LimitsTest.java
+++ b/test/jdk/jdk/classfile/LimitsTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8320360 8330684 8331320 8331655
+ * @bug 8320360 8330684 8331320 8331655 8331940 8332486
  * @summary Testing ClassFile limits.
  * @run junit LimitsTest
  */
@@ -35,8 +35,15 @@
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.Opcode;
 import java.lang.classfile.attribute.CodeAttribute;
+import java.lang.classfile.attribute.LineNumberInfo;
+import java.lang.classfile.attribute.LineNumberTableAttribute;
+import java.lang.classfile.attribute.LocalVariableInfo;
+import java.lang.classfile.attribute.LocalVariableTableAttribute;
 import java.lang.classfile.constantpool.ConstantPoolException;
 import java.lang.classfile.constantpool.IntegerEntry;
+import java.lang.classfile.instruction.LocalVariable;
+import java.util.List;
+import jdk.internal.classfile.impl.DirectCodeBuilder;
 import jdk.internal.classfile.impl.DirectMethodBuilder;
 import jdk.internal.classfile.impl.LabelContext;
 import jdk.internal.classfile.impl.UnboundAttribute;
@@ -161,4 +168,26 @@ public void writeBody(BufWriter b) {
                                     b.writeU2(0);//attributes
                                 }})))).methods().get(0).code().get().elementList());
     }
+
+    @Test
+    void testLineNumberOutOfBounds() {
+        assertThrows(IllegalArgumentException.class, () ->
+                ClassFile.of().parse(ClassFile.of().build(ClassDesc.of("LineNumberClass"), cb -> cb.withMethodBody(
+                "lineNumberMethod", MethodTypeDesc.of(ConstantDescs.CD_void), 0, cob -> ((DirectCodeBuilder)cob
+                        .return_())
+                        .writeAttribute(LineNumberTableAttribute.of(List.of(LineNumberInfo.of(500, 0))))
+                ))).methods().get(0).code().get().elementList());
+    }
+
+    @Test
+    void testLocalVariableOutOfBounds() {
+        assertThrows(IllegalArgumentException.class, () ->
+                ClassFile.of().parse(ClassFile.of().build(ClassDesc.of("LocalVariableClass"), cb -> cb.withMethodBody(
+                "localVariableMethod", MethodTypeDesc.of(ConstantDescs.CD_void), 0, cob -> ((DirectCodeBuilder)cob
+                        .return_())
+                        .writeAttribute(LocalVariableTableAttribute.of(List.of(
+                                new UnboundAttribute.UnboundLocalVariableInfo(0, 200,
+                                        cob.constantPool().utf8Entry("a"), cob.constantPool().utf8Entry("A"), 0))))
+                ))).methods().get(0).code().get().elementList());
+    }
 }
diff --git a/test/jdk/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java b/test/jdk/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java
index 763222e6845..a313aab2552 100644
--- a/test/jdk/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java
+++ b/test/jdk/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,12 +21,16 @@
  * questions.
  */
 
-import com.sun.tools.classfile.*;
-import static com.sun.tools.classfile.ConstantPool.*;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.UncheckedIOException;
+import java.lang.classfile.Attributes;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.MethodModel;
+import java.lang.classfile.Opcode;
+import java.lang.classfile.constantpool.MethodRefEntry;
+import java.lang.classfile.instruction.InvokeInstruction;
 import java.net.URI;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
@@ -47,7 +51,7 @@
  * @bug 8010117
  * @summary Verify if CallerSensitive methods are annotated with
  *          CallerSensitive annotation
- * @modules jdk.jdeps/com.sun.tools.classfile jdk.jdeps/com.sun.tools.jdeps
+ * @enablePreview
  * @build CallerSensitiveFinder
  * @run main/othervm/timeout=900 CallerSensitiveFinder
  */
@@ -87,58 +91,71 @@ public static void main(String[] args) throws Exception {
     }
 
     private final List<String> csMethodsMissingAnnotation = new CopyOnWriteArrayList<>();
-    private final ReferenceFinder finder;
     public CallerSensitiveFinder() {
-        this.finder = new ReferenceFinder(getFilter(), getVisitor());
         pool = Executors.newFixedThreadPool(numThreads);
 
     }
 
-    private ReferenceFinder.Filter getFilter() {
-        final String classname = "jdk/internal/reflect/Reflection";
-        final String method = "getCallerClass";
-        return new ReferenceFinder.Filter() {
-            public boolean accept(ConstantPool cpool, CPRefInfo cpref) {
-                try {
-                    CONSTANT_NameAndType_info nat = cpref.getNameAndTypeInfo();
-                    return cpref.getClassName().equals(classname) && nat.getName().equals(method);
-                } catch (ConstantPoolException ex) {
-                    throw new RuntimeException(ex);
+    private void check(ClassModel clazz) {
+        final String className = "jdk/internal/reflect/Reflection";
+        final String methodName = "getCallerClass";
+        boolean checkMethods = false;
+        for (var pe : clazz.constantPool()) {
+            if (pe instanceof MethodRefEntry ref
+                    && ref.owner().name().equalsString(className)
+                    && ref.name().equalsString(methodName)) {
+                checkMethods = true;
+            }
+        }
+
+        if (!checkMethods)
+            return;
+
+        for (var method : clazz.methods()) {
+            var code = method.code().orElse(null);
+            if (code == null)
+                continue;
+
+            boolean needsCsm = false;
+            for (var element : code) {
+                if (element instanceof InvokeInstruction invoke
+                        && invoke.opcode() == Opcode.INVOKESTATIC
+                        && invoke.method() instanceof MethodRefEntry ref
+                        && ref.owner().name().equalsString(className)
+                        && ref.name().equalsString(methodName)) {
+                    needsCsm = true;
+                    break;
                 }
             }
-        };
+
+            if (needsCsm) {
+                process(clazz, method);
+            }
+        }
     }
 
-    private ReferenceFinder.Visitor getVisitor() {
-        return new ReferenceFinder.Visitor() {
-            public void visit(ClassFile cf, Method m,  List<CPRefInfo> refs) {
-                try {
-                    // ignore jdk.unsupported/sun.reflect.Reflection.getCallerClass
-                    // which is a "special" delegate to the internal getCallerClass
-                    if (cf.getName().equals("sun/reflect/Reflection") &&
-                        m.getName(cf.constant_pool).equals("getCallerClass"))
-                        return;
-
-                    String name = String.format("%s#%s %s", cf.getName(),
-                                                m.getName(cf.constant_pool),
-                                                m.descriptor.getValue(cf.constant_pool));
-                    if (!CallerSensitiveFinder.isCallerSensitive(m, cf.constant_pool)) {
-                        csMethodsMissingAnnotation.add(name);
-                        System.err.println("Missing @CallerSensitive: " + name);
-                    } else {
-                        if (verbose) {
-                            System.out.format("@CS  %s%n", name);
-                        }
-                    }
-                } catch (ConstantPoolException ex) {
-                    throw new RuntimeException(ex);
-                }
+    private void process(ClassModel cf, MethodModel m) {
+        // ignore jdk.unsupported/sun.reflect.Reflection.getCallerClass
+        // which is a "special" delegate to the internal getCallerClass
+        if (cf.thisClass().name().equalsString("sun/reflect/Reflection") &&
+                m.methodName().equalsString("getCallerClass"))
+            return;
+
+        String name = cf.thisClass().asInternalName() + '#'
+                + m.methodName().stringValue() + ' '
+                + m.methodType().stringValue();
+        if (!CallerSensitiveFinder.isCallerSensitive(m)) {
+            csMethodsMissingAnnotation.add(name);
+            System.err.println("Missing @CallerSensitive: " + name);
+        } else {
+            if (verbose) {
+                System.out.format("@CS  %s%n", name);
             }
-        };
+        }
     }
 
     public List<String> run(Stream<Path> classes)throws IOException, InterruptedException,
-            ExecutionException, ConstantPoolException
+            ExecutionException, IllegalArgumentException
     {
         classes.forEach(p -> pool.submit(getTask(p)));
         waitForCompletion();
@@ -146,16 +163,11 @@ public List<String> run(Stream<Path> classes)throws IOException, InterruptedExce
     }
 
     private static final String CALLER_SENSITIVE_ANNOTATION = "Ljdk/internal/reflect/CallerSensitive;";
-    private static boolean isCallerSensitive(Method m, ConstantPool cp)
-            throws ConstantPoolException
-    {
-        RuntimeAnnotations_attribute attr =
-            (RuntimeAnnotations_attribute)m.attributes.get(Attribute.RuntimeVisibleAnnotations);
+    private static boolean isCallerSensitive(MethodModel m) {
+        var attr = m.findAttribute(Attributes.RUNTIME_VISIBLE_ANNOTATIONS).orElse(null);
         if (attr != null) {
-            for (int i = 0; i < attr.annotations.length; i++) {
-                Annotation ann = attr.annotations[i];
-                String annType = cp.getUTF8Value(ann.type_index);
-                if (CALLER_SENSITIVE_ANNOTATION.equals(annType)) {
+            for (var ann : attr.annotations()) {
+                if (ann.className().equalsString(CALLER_SENSITIVE_ANNOTATION)) {
                     return true;
                 }
             }
@@ -174,12 +186,11 @@ private static boolean isCallerSensitive(Method m, ConstantPool cp)
     private FutureTask<Void> getTask(Path p) {
         FutureTask<Void> task = new FutureTask<>(new Callable<>() {
             public Void call() throws Exception {
-                try (InputStream is = Files.newInputStream(p)) {
-                    finder.parse(ClassFile.read(is));
+                try {
+                    var clz = ClassFile.of().parse(p); // propagate IllegalArgumentException
+                    check(clz);
                 } catch (IOException x) {
                     throw new UncheckedIOException(x);
-                } catch (ConstantPoolException x) {
-                    throw new RuntimeException(x);
                 }
                 return null;
             }
diff --git a/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java b/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java
index 0a9d75e27a8..0a8a0ccfaea 100644
--- a/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java
+++ b/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,21 +21,23 @@
  * questions.
  */
 
-import com.sun.tools.classfile.*;
-
-import static com.sun.tools.classfile.AccessFlags.ACC_PRIVATE;
-import static com.sun.tools.classfile.ConstantPool.*;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.UncheckedIOException;
+import java.lang.classfile.Attributes;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.MethodModel;
+import java.lang.classfile.Opcode;
+import java.lang.classfile.constantpool.MethodRefEntry;
+import java.lang.classfile.instruction.InvokeInstruction;
+import java.lang.reflect.AccessFlag;
 import java.net.URI;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -50,12 +52,13 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static java.lang.constant.ConstantDescs.CD_Class;
+
 /*
  * @test
  * @summary CallerSensitive methods should be static or final instance
  *          methods except the known list of non-final instance methods
- * @modules jdk.jdeps/com.sun.tools.classfile
- *          jdk.jdeps/com.sun.tools.jdeps
+ * @enablePreview
  * @build CheckCSMs
  * @run main/othervm/timeout=900 CheckCSMs
  */
@@ -66,7 +69,7 @@ public class CheckCSMs {
 
     // The goal is to remove this list of Non-final instance @CS methods
     // over time.  Do not add any new one to this list.
-    private static Set<String> KNOWN_NON_FINAL_CSMS =
+    private static final Set<String> KNOWN_NON_FINAL_CSMS =
         Set.of("java/io/ObjectStreamField#getType ()Ljava/lang/Class;",
                "java/lang/Runtime#load (Ljava/lang/String;)V",
                "java/lang/Runtime#loadLibrary (Ljava/lang/String;)V",
@@ -111,119 +114,120 @@ public static void main(String[] args) throws Exception {
     private final Set<String> nonFinalCSMs = new ConcurrentSkipListSet<>();
     private final Map<String, Set<String>> csmWithCallerParameter = new ConcurrentHashMap<>();
 
-    private final ReferenceFinder finder;
     public CheckCSMs() {
-        this.finder = new ReferenceFinder(getFilter(), getVisitor());
         pool = Executors.newFixedThreadPool(numThreads);
-
     }
 
     public Set<String> run(Stream<Path> classes)
         throws IOException, InterruptedException, ExecutionException,
-               ConstantPoolException
+               IllegalArgumentException
     {
         classes.forEach(p -> pool.submit(getTask(p)));
         waitForCompletion();
         return nonFinalCSMs;
     }
 
+    private void check(ClassModel clazz) {
+        final String className = "jdk/internal/reflect/Reflection";
+        final String methodName = "getCallerClass";
+        boolean checkMethods = false;
+        for (var pe : clazz.constantPool()) {
+            if (pe instanceof MethodRefEntry ref
+                    && ref.owner().name().equalsString(className)
+                    && ref.name().equalsString(methodName)) {
+                checkMethods = true;
+            }
+        }
+
+        if (!checkMethods)
+            return;
 
-    private ReferenceFinder.Filter getFilter() {
-        final String classname = "jdk/internal/reflect/Reflection";
-        final String method = "getCallerClass";
-        return new ReferenceFinder.Filter() {
-            public boolean accept(ConstantPool cpool, CPRefInfo cpref) {
-                try {
-                    CONSTANT_NameAndType_info nat = cpref.getNameAndTypeInfo();
-                    return cpref.getClassName().equals(classname) && nat.getName().equals(method);
-                } catch (ConstantPoolException ex) {
-                    throw new RuntimeException(ex);
+        for (var method : clazz.methods()) {
+            var code = method.code().orElse(null);
+            if (code == null)
+                continue;
+
+            boolean needsCsm = false;
+            for (var element : code) {
+                if (element instanceof InvokeInstruction invoke
+                        && invoke.opcode() == Opcode.INVOKESTATIC
+                        && invoke.method() instanceof MethodRefEntry ref
+                        && ref.owner().name().equalsString(className)
+                        && ref.name().equalsString(methodName)) {
+                    needsCsm = true;
+                    break;
                 }
             }
-        };
-    }
 
-    private ReferenceFinder.Visitor getVisitor() {
-        return new ReferenceFinder.Visitor() {
-            public void visit(ClassFile cf, Method m,  List<CPRefInfo> refs) {
-                try {
-                    // ignore jdk.unsupported/sun.reflect.Reflection.getCallerClass
-                    // which is a "special" delegate to the internal getCallerClass
-                    if (cf.getName().equals("sun/reflect/Reflection") &&
-                        m.getName(cf.constant_pool).equals("getCallerClass"))
-                        return;
-
-                    String name = methodSignature(cf, m);
-                    if (!CheckCSMs.isStaticOrFinal(cf, m, cf.constant_pool)) {
-                        System.err.println("Unsupported @CallerSensitive: " + name);
-                        nonFinalCSMs.add(name);
-                    } else {
-                        if (listCSMs) {
-                            System.out.format("@CS  %s%n", name);
-                        }
-                    }
-
-                    // find the adapter implementation for CSM with the caller parameter
-                    if (!csmWithCallerParameter.containsKey(cf.getName())) {
-                        Set<String> methods = Arrays.stream(cf.methods)
-                                                    .filter(m0 -> csmWithCallerParameter(cf, m, m0))
-                                                    .map(m0 -> methodSignature(cf, m0))
-                                                    .collect(Collectors.toSet());
-                        csmWithCallerParameter.put(cf.getName(), methods);
-                    }
-                } catch (ConstantPoolException ex) {
-                    throw new RuntimeException(ex);
-                }
+            if (needsCsm) {
+                process(clazz, method);
             }
-        };
+        }
     }
 
-    private static String methodSignature(ClassFile cf, Method m) {
-        try {
-            return String.format("%s#%s %s", cf.getName(),
-                                 m.getName(cf.constant_pool),
-                                 m.descriptor.getValue(cf.constant_pool));
-        } catch (ConstantPoolException ex) {
-            throw new RuntimeException(ex);
+    private void process(ClassModel cf, MethodModel m) {
+        // ignore jdk.unsupported/sun.reflect.Reflection.getCallerClass
+        // which is a "special" delegate to the internal getCallerClass
+        if (cf.thisClass().name().equalsString("sun/reflect/Reflection")
+                && m.methodName().equalsString("getCallerClass"))
+            return;
+
+        String name = methodSignature(cf, m);
+        if (!CheckCSMs.isStaticOrFinal(cf, m)) {
+            System.err.println("Unsupported @CallerSensitive: " + name);
+            nonFinalCSMs.add(name);
+        } else {
+            if (listCSMs) {
+                System.out.format("@CS  %s%n", name);
+            }
+        }
+
+        // find the adapter implementation for CSM with the caller parameter
+        if (!csmWithCallerParameter.containsKey(cf.thisClass().asInternalName())) {
+            Set<String> methods = cf.methods().stream()
+                    .filter(m0 -> csmWithCallerParameter(cf, m, m0))
+                    .map(m0 -> methodSignature(cf, m0))
+                    .collect(Collectors.toSet());
+            csmWithCallerParameter.put(cf.thisClass().asInternalName(), methods);
         }
     }
 
-    private static boolean csmWithCallerParameter(ClassFile cf, Method csm, Method m) {
-        ConstantPool cp = cf.constant_pool;
-        try {
-            int csmParamCount = csm.descriptor.getParameterCount(cp);
-            int paramCount = m.descriptor.getParameterCount(cp);
-            // an adapter method must have the same name and return type and a trailing Class parameter
-            if (!(csm.getName(cp).equals(m.getName(cp)) &&
-                    paramCount == (csmParamCount+1) &&
-                    m.descriptor.getReturnType(cp).equals(csm.descriptor.getReturnType(cp)))) {
+    private static String methodSignature(ClassModel cf, MethodModel m) {
+        return cf.thisClass().asInternalName() + '#'
+                + m.methodName().stringValue() + ' '
+                + m.methodType().stringValue();
+    }
+
+    private static boolean csmWithCallerParameter(ClassModel cf, MethodModel csm, MethodModel m) {
+        var csmType = csm.methodTypeSymbol();
+        var mType = m.methodTypeSymbol();
+        // an adapter method must have the same name and return type and a trailing Class parameter
+        if (!(csm.methodName().equals(m.methodName()) &&
+                mType.parameterCount() == (csmType.parameterCount() + 1) &&
+                mType.returnType().equals(csmType.returnType()))) {
+            return false;
+        }
+        // the descriptor of the adapter method must have the parameters
+        // of the caller-sensitive method and an additional Class parameter
+        for (int i = 0; i < csmType.parameterCount(); i++) {
+            if (mType.parameterType(i) != csmType.parameterType(i)) {
                 return false;
             }
-            // the descriptor of the adapter method must have the parameters
-            // of the caller-sensitive method and an additional Class parameter
-            String csmDesc = csm.descriptor.getParameterTypes(cp);
-            String desc = m.descriptor.getParameterTypes(cp);
-            int index = desc.indexOf(", java.lang.Class)");
-            if (index == -1) {
-                index = desc.indexOf("java.lang.Class)");
-                if (index == -1) return false;
-            }
-            String s = desc.substring(0, index) + ")";
-            if (s.equals(csmDesc)) {
-                if (!m.access_flags.is(ACC_PRIVATE)) {
-                    throw new RuntimeException(methodSignature(cf, m) + " adapter method for " +
-                            methodSignature(cf, csm) + " must be private");
-                }
-                if (!isCallerSensitiveAdapter(m, cp)) {
-                    throw new RuntimeException(methodSignature(cf, m) + " adapter method for " +
-                            methodSignature(cf, csm) + " must be annotated with @CallerSensitiveAdapter");
-                }
-                return true;
-            }
-        } catch (ConstantPoolException|Descriptor.InvalidDescriptor e) {
-            throw new RuntimeException(e);
         }
-        return false;
+
+        if (!mType.parameterType(mType.parameterCount() - 1).equals(CD_Class)) {
+            return false;
+        }
+
+        if (!m.flags().has(AccessFlag.PRIVATE)) {
+            throw new RuntimeException(methodSignature(cf, m) + " adapter method for " +
+                    methodSignature(cf, csm) + " must be private");
+        }
+        if (!isCallerSensitiveAdapter(m)) {
+            throw new RuntimeException(methodSignature(cf, m) + " adapter method for " +
+                    methodSignature(cf, csm) + " must be annotated with @CallerSensitiveAdapter");
+        }
+        return true;
     }
 
     private static final String CALLER_SENSITIVE_ANNOTATION
@@ -231,16 +235,13 @@ private static boolean csmWithCallerParameter(ClassFile cf, Method csm, Method m
     private static final String CALLER_SENSITIVE_ADAPTER_ANNOTATION
         = "Ljdk/internal/reflect/CallerSensitiveAdapter;";
 
-    private static boolean isCallerSensitive(Method m, ConstantPool cp)
-        throws ConstantPoolException
+    private static boolean isCallerSensitive(MethodModel m)
+        throws IllegalArgumentException
     {
-        RuntimeAnnotations_attribute attr =
-            (RuntimeAnnotations_attribute)m.attributes.get(Attribute.RuntimeVisibleAnnotations);
+        var attr = m.findAttribute(Attributes.RUNTIME_VISIBLE_ANNOTATIONS).orElse(null);
         if (attr != null) {
-            for (int i = 0; i < attr.annotations.length; i++) {
-                Annotation ann = attr.annotations[i];
-                String annType = cp.getUTF8Value(ann.type_index);
-                if (CALLER_SENSITIVE_ANNOTATION.equals(annType)) {
+            for (var ann : attr.annotations()) {
+                if (ann.className().equalsString(CALLER_SENSITIVE_ANNOTATION)) {
                     return true;
                 }
             }
@@ -248,16 +249,12 @@ private static boolean isCallerSensitive(Method m, ConstantPool cp)
         return false;
     }
 
-    private static boolean isCallerSensitiveAdapter(Method m, ConstantPool cp)
-            throws ConstantPoolException
-    {
-        RuntimeAnnotations_attribute attr =
-                (RuntimeAnnotations_attribute)m.attributes.get(Attribute.RuntimeInvisibleAnnotations);
+    private static boolean isCallerSensitiveAdapter(MethodModel m) {
+        var attr = m.findAttribute(Attributes.RUNTIME_INVISIBLE_ANNOTATIONS).orElse(null);
+
         if (attr != null) {
-            for (int i = 0; i < attr.annotations.length; i++) {
-                Annotation ann = attr.annotations[i];
-                String annType = cp.getUTF8Value(ann.type_index);
-                if (CALLER_SENSITIVE_ADAPTER_ANNOTATION.equals(annType)) {
+            for (var ann : attr.annotations()) {
+                if (ann.className().equalsString(CALLER_SENSITIVE_ADAPTER_ANNOTATION)) {
                     return true;
                 }
             }
@@ -265,16 +262,14 @@ private static boolean isCallerSensitiveAdapter(Method m, ConstantPool cp)
         return false;
     }
 
-    private static boolean isStaticOrFinal(ClassFile cf, Method m, ConstantPool cp)
-        throws ConstantPoolException
-    {
-        if (!isCallerSensitive(m, cp))
+    private static boolean isStaticOrFinal(ClassModel cf, MethodModel m) {
+        if (!isCallerSensitive(m))
             return false;
 
         // either a static method or a final instance method
-        return m.access_flags.is(AccessFlags.ACC_STATIC) ||
-               m.access_flags.is(AccessFlags.ACC_FINAL) ||
-               cf.access_flags.is(AccessFlags.ACC_FINAL);
+        return m.flags().has(AccessFlag.STATIC) ||
+               m.flags().has(AccessFlag.FINAL) ||
+               cf.flags().has(AccessFlag.FINAL);
     }
 
     private final List<FutureTask<Void>> tasks = new ArrayList<>();
@@ -288,12 +283,11 @@ private static boolean isStaticOrFinal(ClassFile cf, Method m, ConstantPool cp)
     private FutureTask<Void> getTask(Path p) {
         FutureTask<Void> task = new FutureTask<>(new Callable<>() {
             public Void call() throws Exception {
-                try (InputStream is = Files.newInputStream(p)) {
-                    finder.parse(ClassFile.read(is));
+                try {
+                    var clz = ClassFile.of().parse(p); // propagate IllegalArgumentException
+                    check(clz);
                 } catch (IOException x) {
                     throw new UncheckedIOException(x);
-                } catch (ConstantPoolException x) {
-                    throw new RuntimeException(x);
                 }
                 return null;
             }
diff --git a/test/jdk/jdk/internal/reflect/CallerSensitive/MissingCallerSensitive.java b/test/jdk/jdk/internal/reflect/CallerSensitive/MissingCallerSensitive.java
index b9d4706fe40..781c75b23ae 100644
--- a/test/jdk/jdk/internal/reflect/CallerSensitive/MissingCallerSensitive.java
+++ b/test/jdk/jdk/internal/reflect/CallerSensitive/MissingCallerSensitive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,7 @@
  * @bug 8010117
  * @summary Test CallerSensitiveFinder to find missing annotation
  * @modules java.base/jdk.internal.reflect
- *          jdk.jdeps/com.sun.tools.classfile
- *          jdk.jdeps/com.sun.tools.jdeps
+ * @enablePreview
  * @compile -XDignore.symbol.file MissingCallerSensitive.java
  * @build CallerSensitiveFinder
  * @run main MissingCallerSensitive
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
index 0b832366286..9f071bc1450 100644
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
+++ b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
@@ -511,6 +511,28 @@
  * @run main/othervm -Djava.security.debug=certpath,ocsp -Dcom.sun.security.ocsp.useget=false CAInterop certainlyroote1 DEFAULT
  */
 
+/*
+ * @test id=globalsignr46
+ * @bug 8316138
+ * @summary Interoperability tests with GlobalSign Root R46
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop globalsignr46 OCSP
+ * @run main/othervm -Djava.security.debug=certpath,ocsp -Dcom.sun.security.ocsp.useget=false CAInterop globalsignr46 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop globalsignr46 CRL
+ */
+
+/*
+ * @test id=globalsigne46
+ * @bug 8316138
+ * @summary Interoperability tests with GlobalSign Root E46
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop globalsigne46 OCSP
+ * @run main/othervm -Djava.security.debug=certpath,ocsp -Dcom.sun.security.ocsp.useget=false CAInterop globalsigne46 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop globalsigne46 CRL
+ */
+
 /**
  * Collection of certificate validation tests for interoperability with external CAs
  */
@@ -680,6 +702,13 @@ private CATestURLs getTestURLs(String alias) {
                     new CATestURLs("https://valid.root-e1.certainly.com",
                             "https://revoked.root-e1.certainly.com");
 
+            case "globalsignr46" ->
+                    new CATestURLs("https://valid.r46.roots.globalsign.com",
+                            "https://revoked.r46.roots.globalsign.com");
+            case "globalsigne46" ->
+                    new CATestURLs("https://valid.e46.roots.globalsign.com",
+                            "https://revoked.e46.roots.globalsign.com");
+
             default -> throw new RuntimeException("No test setup found for: " + alias);
         };
     }
diff --git a/test/jdk/sun/net/www/http/KeepAliveCache/B5045306.java b/test/jdk/sun/net/www/http/KeepAliveCache/B5045306.java
index 2d275ebfc9e..b9b9de57cdf 100644
--- a/test/jdk/sun/net/www/http/KeepAliveCache/B5045306.java
+++ b/test/jdk/sun/net/www/http/KeepAliveCache/B5045306.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,9 @@
 /*
  * @test
  * @bug 5045306 6356004 6993490 8255124
+ * @summary Http keep-alive implementation is not efficient
  * @library /test/lib
  * @run main/othervm B5045306
- * @summary Http keep-alive implementation is not efficient
  */
 
 import java.io.IOException;
@@ -42,14 +42,17 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
 
+import jdk.test.lib.net.URIBuilder;
+
 /* Part 1:
- * The http client makes a connection to a URL whos content contains a lot of
+ * The http client makes a connection to a URL whose content contains a lot of
  * data, more than can fit in the socket buffer. The client only reads
  * 1 byte of the data from the InputStream leaving behind more data than can
  * fit in the socket buffer. The client then makes a second call to the http
@@ -63,150 +66,166 @@
 
 public class B5045306 {
     static HttpServer server;
-
-    public static void main(String[] args) {
-        startHttpServer();
-        clientHttpCalls();
-    }
+    static ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public static void startHttpServer() {
         try {
-            server = HttpServer.create(new InetSocketAddress(InetAddress.getLocalHost(), 0), 10, "/", new SimpleHttpTransactionHandler());
-            server.setExecutor(Executors.newSingleThreadExecutor());
-            server.start();
+            server = HttpServer.create(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 10, "/", new SimpleHttpTransactionHandler());
         } catch (IOException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
+        server.setExecutor(executor);
+        server.start();
+        System.out.println("http server listens on: " + server.getAddress());
     }
 
-    public static void clientHttpCalls() {
+    public static void stopHttpServer() {
+        server.stop(1);
+        executor.shutdown();
+    }
+
+    public static void clientHttpCalls() throws Exception {
         List<Throwable> uncaught = new ArrayList<>();
         Thread.setDefaultUncaughtExceptionHandler((t, ex) -> {
             uncaught.add(ex);
         });
-        try {
-            System.out.println("http server listen on: " + server.getAddress().getPort());
-            String hostAddr =  InetAddress.getLocalHost().getHostAddress();
-            if (hostAddr.indexOf(':') > -1) hostAddr = "[" + hostAddr + "]";
-            String baseURLStr = "http://" + hostAddr + ":" + server.getAddress().getPort() + "/";
 
-            URL bigDataURL = new URL (baseURLStr + "firstCall");
-            URL smallDataURL = new URL (baseURLStr + "secondCall");
+        URL bigDataURL = URIBuilder.newBuilder()
+                .scheme("http")
+                .loopback()
+                .port(server.getAddress().getPort())
+                .path("/firstCall")
+                .toURL();
+
+        URL smallDataURL = URIBuilder.newBuilder()
+                .scheme("http")
+                .loopback()
+                .port(server.getAddress().getPort())
+                .path("/secondCall")
+                .toURL();
 
-            HttpURLConnection uc = (HttpURLConnection)bigDataURL.openConnection(Proxy.NO_PROXY);
+        HttpURLConnection uc = (HttpURLConnection)bigDataURL.openConnection(Proxy.NO_PROXY);
 
-            //Only read 1 byte of response data and close the stream
-            InputStream is = uc.getInputStream();
+        // Only read 1 byte of response data and close the stream
+        try (InputStream is = uc.getInputStream()) {
             byte[] ba = new byte[1];
             is.read(ba);
-            is.close();
-
-            // Allow the KeepAliveStreamCleaner thread to read the data left behind and cache the connection.
-            try { Thread.sleep(2000); } catch (Exception e) {}
-
-            uc = (HttpURLConnection)smallDataURL.openConnection(Proxy.NO_PROXY);
-            uc.getResponseCode();
-
-            if (SimpleHttpTransactionHandler.failed)
-                throw new RuntimeException("Failed: Initial Keep Alive Connection is not being reused");
-
-            // Part 2
-            URL part2Url = new URL (baseURLStr + "part2");
-            uc = (HttpURLConnection)part2Url.openConnection(Proxy.NO_PROXY);
-            is = uc.getInputStream();
-            is.close();
-
-            // Allow the KeepAliveStreamCleaner thread to try and read the data left behind and cache the connection.
-            try { Thread.sleep(2000); } catch (Exception e) {}
-
-            ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
-            if (threadMXBean.isThreadCpuTimeSupported()) {
-                long[] threads = threadMXBean.getAllThreadIds();
-                ThreadInfo[] threadInfo = threadMXBean.getThreadInfo(threads);
-                for (int i=0; i<threadInfo.length; i++) {
-                    if (threadInfo[i].getThreadName().equals("Keep-Alive-SocketCleaner"))  {
-                        System.out.println("Found Keep-Alive-SocketCleaner thread");
-                        long threadID = threadInfo[i].getThreadId();
-                        long before = threadMXBean.getThreadCpuTime(threadID);
-                        try { Thread.sleep(2000); } catch (Exception e) {}
-                        long after = threadMXBean.getThreadCpuTime(threadID);
-
-                        if (before ==-1 || after == -1)
-                            break;  // thread has died, OK
-
-                        // if Keep-Alive-SocketCleaner consumes more than 50% of cpu then we
-                        // can assume a recursive loop.
-                        long total = after - before;
-                        if (total >= 1000000000)  // 1 second, or 1 billion nanoseconds
-                            throw new RuntimeException("Failed: possible recursive loop in Keep-Alive-SocketCleaner");
-                    }
+        }
+
+        // Allow the KeepAliveStreamCleaner thread to read the data left behind and cache the connection.
+        try { Thread.sleep(2000); } catch (Exception e) {}
+
+        uc = (HttpURLConnection)smallDataURL.openConnection(Proxy.NO_PROXY);
+        uc.getResponseCode();
+
+        if (SimpleHttpTransactionHandler.failed)
+            throw new RuntimeException("Failed: Initial Keep Alive Connection is not being reused");
+
+        // Part 2
+        URL part2Url = URIBuilder.newBuilder()
+                .scheme("http")
+                .loopback()
+                .port(server.getAddress().getPort())
+                .path("/part2")
+                .toURL();
+
+        uc = (HttpURLConnection)part2Url.openConnection(Proxy.NO_PROXY);
+        try (InputStream is = uc.getInputStream()) {}
+
+        // Allow the KeepAliveStreamCleaner thread to try and read the data left behind and cache the connection.
+        try { Thread.sleep(2000); } catch (Exception e) {}
+
+        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+        if (threadMXBean.isThreadCpuTimeSupported()) {
+            long[] threads = threadMXBean.getAllThreadIds();
+            ThreadInfo[] threadInfo = threadMXBean.getThreadInfo(threads);
+            for (int i = 0; i < threadInfo.length; i++) {
+                if (threadInfo[i].getThreadName().equals("Keep-Alive-SocketCleaner")) {
+                    System.out.println("Found Keep-Alive-SocketCleaner thread");
+                    long threadID = threadInfo[i].getThreadId();
+                    long before = threadMXBean.getThreadCpuTime(threadID);
+                    try { Thread.sleep(2000); } catch (Exception e) {}
+                    long after = threadMXBean.getThreadCpuTime(threadID);
+
+                    if (before ==-1 || after == -1)
+                        break;  // thread has died, OK
+
+                    // if Keep-Alive-SocketCleaner consumes more than 50% of cpu then we
+                    // can assume a recursive loop.
+                    long total = after - before;
+                    if (total >= 1000000000)  // 1 second, or 1 billion nanoseconds
+                        throw new RuntimeException("Failed: possible recursive loop in Keep-Alive-SocketCleaner");
                 }
             }
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            server.stop(1);
         }
         if (!uncaught.isEmpty()) {
             throw new RuntimeException("Unhandled exception:", uncaught.get(0));
         }
     }
-}
 
-class SimpleHttpTransactionHandler implements HttpHandler
-{
-    static volatile boolean failed = false;
+    static class SimpleHttpTransactionHandler implements HttpHandler {
+        static volatile boolean failed = false;
 
-    // Need to have enough data here that is too large for the socket buffer to hold.
-    // Also http.KeepAlive.remainingData must be greater than this value, default is 256K.
-    static final int RESPONSE_DATA_LENGTH = 128 * 1024;
+        // Need to have enough data here that is too large for the socket buffer to hold.
+        // Also http.KeepAlive.remainingData must be greater than this value, default is 256K.
+        static final int RESPONSE_DATA_LENGTH = 128 * 1024;
 
-    int port1;
+        int port1;
 
-    public void handle(HttpExchange trans) {
-        try {
-            String path = trans.getRequestURI().getPath();
-            if (path.equals("/firstCall")) {
-                port1 = trans.getRemoteAddress().getPort();
-                System.out.println("First connection on client port = " + port1);
-
-                byte[] responseBody = new byte[RESPONSE_DATA_LENGTH];
-                for (int i=0; i<responseBody.length; i++)
-                    responseBody[i] = 0x41;
-                trans.sendResponseHeaders(200, responseBody.length);
-                try (OutputStream os = trans.getResponseBody()) {
+        public void handle(HttpExchange trans) {
+            try {
+                String path = trans.getRequestURI().getPath();
+                if (path.equals("/firstCall")) {
+                    port1 = trans.getRemoteAddress().getPort();
+                    System.out.println("First connection on client port = " + port1);
+
+                    byte[] responseBody = new byte[RESPONSE_DATA_LENGTH];
+                    for (int i=0; i<responseBody.length; i++)
+                        responseBody[i] = 0x41;
+                    trans.sendResponseHeaders(200, responseBody.length);
+                    try (OutputStream os = trans.getResponseBody()) {
+                        os.write(responseBody);
+                    }
+                } else if (path.equals("/secondCall")) {
+                    int port2 = trans.getRemoteAddress().getPort();
+                    System.out.println("Second connection on client port = " + port2);
+
+                    if (port1 != port2)
+                        failed = true;
+
+                     /* Force the server to not respond for more that the timeout
+                      * set by the keepalive cleaner (5000 millis). This ensures the
+                      * timeout is correctly resets the default read timeout,
+                      * infinity. See 6993490. */
+                    System.out.println("server sleeping...");
+                    try {Thread.sleep(6000); } catch (InterruptedException e) {}
+                    trans.sendResponseHeaders(200, -1);
+                } else if (path.equals("/part2")) {
+                    System.out.println("Call to /part2");
+                    byte[] responseBody = new byte[RESPONSE_DATA_LENGTH];
+                    for (int i=0; i<responseBody.length; i++)
+                        responseBody[i] = 0x41;
+                    // override the Content-length header to be greater than the actual response body
+                    trans.sendResponseHeaders(200, responseBody.length+1);
+                    OutputStream os = trans.getResponseBody();
                     os.write(responseBody);
+                    // now close the socket
+                    // closing the stream here would throw; close the exchange instead
+                    trans.close();
                 }
-            } else if (path.equals("/secondCall")) {
-                int port2 = trans.getRemoteAddress().getPort();
-                System.out.println("Second connection on client port = " + port2);
-
-                if (port1 != port2)
-                    failed = true;
-
-                 /* Force the server to not respond for more that the timeout
-                  * set by the keepalive cleaner (5000 millis). This ensures the
-                  * timeout is correctly resets the default read timeout,
-                  * infinity. See 6993490. */
-                System.out.println("server sleeping...");
-                try {Thread.sleep(6000); } catch (InterruptedException e) {}
-                trans.sendResponseHeaders(200, -1);
-            } else if(path.equals("/part2")) {
-                System.out.println("Call to /part2");
-                byte[] responseBody = new byte[RESPONSE_DATA_LENGTH];
-                for (int i=0; i<responseBody.length; i++)
-                    responseBody[i] = 0x41;
-                // override the Content-length header to be greater than the actual response body
-                trans.sendResponseHeaders(200, responseBody.length+1);
-                OutputStream os = trans.getResponseBody();
-                os.write(responseBody);
-                // now close the socket
-                // closing the stream here would throw; close the exchange instead
-                trans.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+                failed = true;
             }
-        } catch (Exception e) {
-            e.printStackTrace();
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        startHttpServer();
+        try {
+            clientHttpCalls();
+        } finally {
+            stopHttpServer();
         }
     }
 }
diff --git a/test/jdk/sun/net/www/http/KeepAliveCache/B8291637.java b/test/jdk/sun/net/www/http/KeepAliveCache/B8291637.java
index c96df382017..16afa4a130a 100644
--- a/test/jdk/sun/net/www/http/KeepAliveCache/B8291637.java
+++ b/test/jdk/sun/net/www/http/KeepAliveCache/B8291637.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,43 +24,45 @@
 /*
  * @test
  * @bug 8291637
- * @run main/othervm -Dhttp.keepAlive.time.server=20 -esa -ea B8291637 timeout
- * @run main/othervm -Dhttp.keepAlive.time.server=20 -esa -ea B8291637 max
+ * @library /test/lib
+ * @run main/othervm -Dhttp.keepAlive.time.server=20 -esa -ea B8291637
  */
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.*;
+import java.net.HttpURLConnection;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.CompletableFuture;
 
+import jdk.test.lib.net.URIBuilder;
+
 public class B8291637 {
     static CompletableFuture<Boolean> passed = new CompletableFuture<>();
 
-    static class Server extends Thread {
-        final ServerSocket serverSocket;
-        final int port;
+    static class Server extends Thread implements AutoCloseable {
         final String param; // the parameter to test "max" or "timeout"
+        final ServerSocket serverSocket = new ServerSocket(0);
+        final int port;
         volatile Socket s;
 
         public Server(String param) throws IOException {
-            serverSocket = new ServerSocket(0);
+            this.param = param;
             port = serverSocket.getLocalPort();
             setDaemon(true);
-            this.param = param;
         }
 
         public int getPort() {
             return port;
         }
 
-        public void close() {
-            try {
-                serverSocket.close();
-                if (s != null)
-                    s.close();
-            } catch (IOException e) {}
+        public void close() throws IOException {
+            serverSocket.close();
+            if (s != null)
+                s.close();
         }
 
         static final byte[] requestEnd = new byte[] {'\r', '\n', '\r', '\n' };
@@ -125,28 +127,29 @@ public void run() {
         }
     }
 
-    public static void main(String[] args) throws Exception {
-        Server server = new Server(args[0]);
-        int port = server.getPort();
-        server.start();
-        URL url = new URL("http://127.0.0.1:" + Integer.toString(port) + "/");
-        HttpURLConnection urlc = (HttpURLConnection) url.openConnection();
-        InputStream i = urlc.getInputStream();
-        int c,count=0;
-        byte[] buf = new byte[256];
-        while ((c=i.read(buf)) != -1) {
-            count+=c;
-        }
-        i.close();
-        System.out.println("Read " + count );
-        try {
+    public static void runTest(String param) throws Exception {
+        try (Server server = new Server(param)) {
+            server.start();
+            URL url = URIBuilder.newBuilder()
+                    .scheme("http")
+                    .loopback()
+                    .port(server.getPort())
+                    .path("/")
+                    .toURL();
+            HttpURLConnection urlc = (HttpURLConnection) url.openConnection();
+            try (InputStream i = urlc.getInputStream()) {
+                System.out.println("Read " + i.readAllBytes().length);
+            }
             if (!passed.get()) {
                 throw new RuntimeException("Test failed");
             } else {
                 System.out.println("Test passed");
             }
-        } finally {
-            server.close();
         }
     }
+
+    public static void main(String[] args) throws Exception {
+        runTest("timeout");
+        runTest("max");
+    }
 }
diff --git a/test/jdk/sun/net/www/http/KeepAliveCache/B8293562.java b/test/jdk/sun/net/www/http/KeepAliveCache/B8293562.java
index 0a6e7ef1416..c7202af70dd 100644
--- a/test/jdk/sun/net/www/http/KeepAliveCache/B8293562.java
+++ b/test/jdk/sun/net/www/http/KeepAliveCache/B8293562.java
@@ -24,20 +24,11 @@
 /*
  * @test
  * @bug 8293562
+ * @summary Http keep-alive thread should close sockets without holding a lock
  * @library /test/lib
  * @run main/othervm -Dhttp.keepAlive.time.server=1 B8293562
- * @summary Http keep-alive thread should close sockets without holding a lock
  */
 
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-import com.sun.net.httpserver.HttpServer;
-
-import javax.net.ssl.HandshakeCompletedListener;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -53,6 +44,18 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
+import javax.net.ssl.HandshakeCompletedListener;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+
+import jdk.test.lib.net.URIBuilder;
+
 public class B8293562 {
     static HttpServer server;
     static CountDownLatch closing = new CountDownLatch(1);
@@ -73,12 +76,13 @@ public static void startHttpServer() throws Exception {
 
     public static void clientHttpCalls() throws Exception {
         try {
-            System.out.println("http server listen on: " + server.getAddress().getPort());
-            String hostAddr = InetAddress.getLoopbackAddress().getHostAddress();
-            if (hostAddr.indexOf(':') > -1) hostAddr = "[" + hostAddr + "]";
-            String baseURLStr = "https://" + hostAddr + ":" + server.getAddress().getPort() + "/";
+            System.out.println("http server listens on: " + server.getAddress().getPort());
 
-            URL testUrl = new URL (baseURLStr);
+            URL testUrl = URIBuilder.newBuilder()
+                    .scheme("https")
+                    .loopback()
+                    .port(server.getAddress().getPort())
+                    .toURL();
 
             // SlowCloseSocketFactory is not a real SSLSocketFactory;
             // it produces regular non-SSL sockets. Effectively, the request
diff --git a/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveProperty.java b/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveProperty.java
index 83491ad4e38..0e065b1224c 100644
--- a/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveProperty.java
+++ b/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,18 +23,29 @@
 
 /*
  * @test
- * @library /test/lib
  * @bug 8278067
+ * @library /test/lib
  * @run main/othervm -Dhttp.keepAlive.time.server=30 KeepAliveProperty long
  * @run main/othervm -Dhttp.keepAlive.time.server=1 KeepAliveProperty short
  * @run main/othervm -ea -Dhttp.keepAlive.time.server=0 KeepAliveProperty short
  */
 
-import java.net.*;
-import java.io.*;
-import java.nio.charset.*;
-import java.util.logging.*;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import jdk.test.lib.net.URIBuilder;
+
 import static java.net.Proxy.NO_PROXY;
 
 public class KeepAliveProperty {
diff --git a/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java b/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java
index 5568f0c54a9..44130b2a820 100644
--- a/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java
+++ b/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,16 +23,26 @@
 
 /*
  * @test
- * @library /test/lib
  * @bug 4701299
  * @summary Keep-Alive-Timer thread management in KeepAliveCache causes memory leak
+ * @library /test/lib
  * @run main KeepAliveTimerThread
  * @run main/othervm -Djava.net.preferIPv6Addresses=true KeepAliveTimerThread
  */
 
-import java.net.*;
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketTimeoutException;
+import java.net.URL;
+
 import jdk.test.lib.net.URIBuilder;
+
 import static java.net.Proxy.NO_PROXY;
 
 public class KeepAliveTimerThread {
@@ -131,8 +141,5 @@ public static void main(String args[]) throws Exception {
         if (grp.activeCount() > 0) {
             throw new RuntimeException("Keep-alive thread started in wrong thread group");
         }
-
-        grp.destroy();
     }
-
 }
diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
index 548024efc6c..83427f1a33a 100644
--- a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
+++ b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
@@ -29,7 +29,7 @@
  *      8223499 8225392 8232019 8234245 8233223 8225068 8225069 8243321 8243320
  *      8243559 8225072 8258630 8259312 8256421 8225081 8225082 8225083 8245654
  *      8305975 8304760 8307134 8295894 8314960 8317373 8317374 8318759 8319187
- *      8321408
+ *      8321408 8316138
  * @summary Check root CA entries in cacerts file
  */
 import java.io.ByteArrayInputStream;
@@ -48,12 +48,12 @@ public class VerifyCACerts {
             + File.separator + "security" + File.separator + "cacerts";
 
     // The numbers of certs now.
-    private static final int COUNT = 108;
+    private static final int COUNT = 110;
 
     // SHA-256 of cacerts, can be generated with
     // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95
     private static final String CHECKSUM
-            = "C4:A2:41:9E:B6:4D:77:26:AA:21:02:83:51:C7:88:21:66:1E:D8:88:4A:AC:84:D5:B0:15:0C:7C:C6:45:85:AF";
+            = "BD:80:65:81:68:E5:6C:51:64:ED:B9:08:53:9F:BB:2F:D9:6C:5D:D4:06:D4:16:59:39:10:8E:F8:24:81:8B:78";
 
     // Hex formatter to upper case with ":" delimiter
     private static final HexFormat HEX = HexFormat.ofDelimiter(":").withUpperCase();
@@ -278,6 +278,10 @@ public class VerifyCACerts {
                     "77:B8:2C:D8:64:4C:43:05:F7:AC:C5:CB:15:6B:45:67:50:04:03:3D:51:C6:0C:62:02:A8:E0:C3:34:67:D3:A0");
             put("certainlyroote1 [jdk]",
                     "B4:58:5F:22:E4:AC:75:6A:4E:86:12:A1:36:1C:5D:9D:03:1A:93:FD:84:FE:BB:77:8F:A3:06:8B:0F:C4:2D:C2");
+            put("globalsignr46 [jdk]",
+                    "4F:A3:12:6D:8D:3A:11:D1:C4:85:5A:4F:80:7C:BA:D6:CF:91:9D:3A:5A:88:B0:3B:EA:2C:63:72:D9:3C:40:C9");
+            put("globalsigne46 [jdk]",
+                    "CB:B9:C4:4D:84:B8:04:3E:10:50:EA:31:A6:9F:51:49:55:D7:BF:D2:E2:C6:B4:93:01:01:9A:D6:1D:9F:50:58");
         }
     };
 
diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java
index 4778cc217ba..ea7f4895785 100644
--- a/test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java
+++ b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @library /test/lib /javax/net/ssl/templates
  * @summary Test that a New Session Ticket will be generated when a
  * SSLSessionBindingListener is set (boundValues)
- * @key intermittent
  * @run main/othervm ResumptionUpdateBoundValues
  */
 
@@ -238,7 +237,7 @@ private void run() throws Exception {
         Thread t;
         while ((t = threads.take()) != Thread.currentThread()) {
             System.out.printf("  joining: %s%n", t);
-            t.join(1000L);
+            t.join(4000L);
         }
         serverReady = false;
         System.gc();
diff --git a/test/langtools/TEST.groups b/test/langtools/TEST.groups
index e1ffd5d530b..74503501da9 100644
--- a/test/langtools/TEST.groups
+++ b/test/langtools/TEST.groups
@@ -1,4 +1,4 @@
-#  Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+#  Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
 #  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 #  This code is free software; you can redistribute it and/or modify it
@@ -63,6 +63,9 @@ langtools_jdeps = \
     tools/all \
     tools/jdeps
 
+langtools_slow = \
+    jdk/internal/shellsupport/doc/FullJavadocHelperTest.java
+
 # All tests
 
 all = \
@@ -78,11 +81,13 @@ tier1 = \
     :langtools_all \
     lib \
     tools \
-    -:langtools_jshell_unstable
+    -:langtools_jshell_unstable \
+    -:langtools_slow
 
 # (Almost) no langtools tests are tier 2.
 tier2 = \
-    :langtools_jshell_unstable
+    :langtools_jshell_unstable \
+    :langtools_slow
 
 # No langtools tests are tier 3 either.
 tier3 =
diff --git a/test/langtools/jdk/internal/shellsupport/doc/FullJavadocHelperTest.java b/test/langtools/jdk/internal/shellsupport/doc/FullJavadocHelperTest.java
new file mode 100644
index 00000000000..729ac92143f
--- /dev/null
+++ b/test/langtools/jdk/internal/shellsupport/doc/FullJavadocHelperTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8189778
+ * @summary Test JavadocHelper
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/jdk.internal.shellsupport.doc
+ * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask
+ * @run testng/timeout=900/othervm -Xmx1024m FullJavadocHelperTest
+ */
+
+import java.io.IOException;
+
+import org.testng.annotations.Test;
+
+@Test
+public class FullJavadocHelperTest {
+
+    /*
+     * Long-running test to retrieve doc comments for enclosed elements of all JDK classes.
+     */
+    public void testAllDocs() throws IOException {
+        new JavadocHelperTest().retrieveDocComments(Boolean.TRUE::booleanValue);
+    }
+}
diff --git a/test/langtools/jdk/internal/shellsupport/doc/JavadocHelperTest.java b/test/langtools/jdk/internal/shellsupport/doc/JavadocHelperTest.java
index d8539b8c656..55d258788fe 100644
--- a/test/langtools/jdk/internal/shellsupport/doc/JavadocHelperTest.java
+++ b/test/langtools/jdk/internal/shellsupport/doc/JavadocHelperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,8 @@
  *          jdk.compiler/com.sun.tools.javac.main
  *          jdk.compiler/jdk.internal.shellsupport.doc
  * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask
- * @run testng/timeout=900/othervm -Xmx1024m JavadocHelperTest
+ * @run testng JavadocHelperTest
+ * @key randomness
  */
 
 import java.io.IOException;
@@ -46,6 +47,8 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Random;
+import java.util.function.BooleanSupplier;
 import java.util.function.Function;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
@@ -383,7 +386,35 @@ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOExcept
 
     }
 
-    public void testAllDocs() throws IOException {
+    private static long getSeed() {
+        long seed;
+        try {
+            // Throws NumberFormatException if the property is undefined
+            seed = Long.parseLong(System.getProperty("seed"));
+        } catch (NumberFormatException e) {
+            seed = new Random().nextLong();
+        }
+        System.out.println("Random Seed: " + seed);
+        return seed;
+    }
+
+    /*
+     * Retrieves doc comments for a random subset of JDK classes.
+     * Set the system property `seed` to a random seed to reproduce
+     * a specific run of this test.
+     */
+    public void testRandomDocs() throws IOException {
+        Random random = new Random(getSeed());
+        // Run test on 2% of classes, which corresponds to ~ 140 classes
+        retrieveDocComments(() -> random.nextInt(100) < 2);
+    }
+
+    /**
+     * Retrieve documentation of enclosed elements for some or all JDK classes.
+     *
+     * @param shouldTest oracle function to decide whether a class should be tested
+     */
+    protected void retrieveDocComments(BooleanSupplier shouldTest) throws IOException {
         JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
         DiagnosticListener<? super JavaFileObject> noErrors = d -> {
             if (d.getKind() == Kind.ERROR) {
@@ -408,7 +439,7 @@ public void testAllDocs() throws IOException {
                     }
                 }
                 try (StandardJavaFileManager fm =
-                        compiler.getStandardFileManager(null, null, null)) {
+                             compiler.getStandardFileManager(null, null, null)) {
                     JavacTask task =
                             (JavacTask) compiler.getTask(null, fm, noErrors, null, null, null);
                     task.getElements().getTypeElement("java.lang.Object");
@@ -420,8 +451,10 @@ public void testAllDocs() throws IOException {
                                 List<? extends Element> content =
                                         ed.getPackage().getEnclosedElements();
                                 for (TypeElement clazz : ElementFilter.typesIn(content)) {
-                                    for (Element el : clazz.getEnclosedElements()) {
-                                        helper.getResolvedDocComment(el);
+                                    if (shouldTest.getAsBoolean()) {
+                                        for (Element el : clazz.getEnclosedElements()) {
+                                            helper.getResolvedDocComment(el);
+                                        }
                                     }
                                 }
                             }
diff --git a/test/langtools/jdk/javadoc/doclet/testJavaScriptModules/TestJavaScriptModules.java b/test/langtools/jdk/javadoc/doclet/testJavaScriptModules/TestJavaScriptModules.java
new file mode 100644
index 00000000000..e38215c3d4b
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testJavaScriptModules/TestJavaScriptModules.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug      8317621
+ * @summary  --add-script should support JavaScript modules
+ * @library /tools/lib ../../lib
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
+ * @build toolbox.ToolBox javadoc.tester.*
+ * @run main TestJavaScriptModules
+ */
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+public class TestJavaScriptModules extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestJavaScriptModules();
+        tester.setup().runTests();
+    }
+
+    private final ToolBox tb = new ToolBox();
+    Path src;
+
+    TestJavaScriptModules setup() throws IOException {
+        src = Path.of("src");
+        tb.writeJavaFiles(src, """
+                   /**
+                    * Simple dummy class.
+                    */
+                   public class Test {}
+                   """);
+        tb.writeFile("module.mjs", """
+                   var x = 1;
+                   """);
+        tb.writeFile("module1.js", """
+                   const x = 1;
+                   export class FooModule {}
+                   """);
+        tb.writeFile("module2.js", """
+                   const x = 1;
+                   export function f() {}
+                   """);
+        tb.writeFile("module3.js", """
+                       const x = 1;
+                       export async function a() {}
+                   """);
+        tb.writeFile("module4.js", """
+                   // Another JS module
+                   export const c = 3;
+                   """);
+        tb.writeFile("module5.js", """
+                   export default class FooModule {}
+                   """);
+        tb.writeFile("module6.js", """
+                   const x = 1;
+                   export class FooModule {}
+                   """);
+        tb.writeFile("module7.js", """
+                   function abc() {}
+                   import * as foo from "module1.js";
+                   """);
+        tb.writeFile("module8.js", """
+                   var z = false;
+                   import { _A_, $b, C0 } from "abc.js";
+                   """);
+        tb.writeFile("script1.js", """
+                   var z = false;
+                   import(1, z);
+                   """);
+        tb.writeFile("script2.js", """
+                   export("foo");
+                   """);
+        tb.writeFile("script3.js", """
+                   var import = 1;
+                   """);
+        return this;
+    }
+
+    @Test
+    public void test(Path base) {
+        javadoc("-d", base.resolve("out").toString(),
+                "--add-script", "module.mjs",
+                "--add-script", "module1.js",
+                "--add-script", "module2.js",
+                "--add-script", "module3.js",
+                "--add-script", "module4.js",
+                "--add-script", "module5.js",
+                "--add-script", "module6.js",
+                "--add-script", "module7.js",
+                "--add-script", "module8.js",
+                "--add-script", "script1.js",
+                "--add-script", "script2.js",
+                "--add-script", "script3.js",
+                src.resolve("Test.java").toString());
+        checkExit(Exit.OK);
+
+        checkOutput("Test.html", true,
+                """
+                    <script type="module" src="script-files/module.mjs"></script>""",
+                """
+                    <script type="module" src="script-files/module1.js"></script>""",
+                """
+                    <script type="module" src="script-files/module2.js"></script>""",
+                """
+                    <script type="module" src="script-files/module3.js"></script>""",
+                """
+                    <script type="module" src="script-files/module4.js"></script>""",
+                """
+                    <script type="module" src="script-files/module5.js"></script>""",
+                """
+                    <script type="module" src="script-files/module6.js"></script>""",
+                """
+                    <script type="module" src="script-files/module7.js"></script>""",
+                """
+                    <script type="module" src="script-files/module8.js"></script>""",
+                """
+                    <script type="text/javascript" src="script-files/script1.js"></script>""",
+                """
+                    <script type="text/javascript" src="script-files/script2.js"></script>""",
+                """
+                    <script type="text/javascript" src="script-files/script3.js"></script>""");
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/DivTaglet.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/DivTaglet.java
new file mode 100644
index 00000000000..91cf8d25f91
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/DivTaglet.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.lang.model.element.Element;
+
+import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.UnknownInlineTagTree;
+
+import jdk.javadoc.doclet.Taglet;
+
+/**
+ * An inline taglet that generates output in a {@code <div>} element.
+ */
+public class DivTaglet implements Taglet {
+    @Override
+    public String getName() {
+        return "div";
+    }
+
+    @Override
+    public Set<Location> getAllowedLocations() {
+        return Set.of(Location.values());
+    }
+
+    @Override
+    public boolean isInlineTag() {
+        return true;
+    }
+
+    @Override
+    public String toString(List<? extends DocTree> trees, Element e) {
+        var children = ((UnknownInlineTagTree) trees.get(0)).getContent();
+        return "<div>"
+                + children.stream().map(DocTree::toString).collect(Collectors.joining())
+                + "</div>";
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/SpanTaglet.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/SpanTaglet.java
new file mode 100644
index 00000000000..20e8d109fa4
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/SpanTaglet.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.lang.model.element.Element;
+
+import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.UnknownInlineTagTree;
+
+import jdk.javadoc.doclet.Taglet;
+
+/**
+ * An inline taglet that generates output in a {@code <span>} element.
+ */
+public class SpanTaglet implements Taglet {
+    @Override
+    public String getName() {
+        return "span";
+    }
+
+    @Override
+    public Set<Location> getAllowedLocations() {
+        return Set.of(Location.values());
+    }
+
+    @Override
+    public boolean isInlineTag() {
+        return true;
+    }
+
+    @Override
+    public String toString(List<? extends DocTree> trees, Element e) {
+        var children = ((UnknownInlineTagTree) trees.get(0)).getContent();
+        return "<span>"
+                + children.stream().map(DocTree::toString).collect(Collectors.joining())
+                + "</span>";
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdown.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdown.java
new file mode 100644
index 00000000000..1ee5bb2f4b3
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdown.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdown
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class TestMarkdown extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdown();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testMinimal(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// Hello, _Markdown_ world!
+                    public class C { }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    <div class="block">Hello, <em>Markdown</em> world!</div>
+                    """);
+    }
+
+    @Test
+    public void testMarkdownList(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// Before list.
+                    ///
+                    /// * item 1
+                    /// * item 2
+                    /// * item 3
+                    ///
+                    /// After list.
+                    public class C { }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOrder("p/C.html",
+                """
+                    <p>Before list.</p>
+                    <ul>
+                    <li>item 1</li>
+                    <li>item 2</li>
+                    <li>item 3</li>
+                    </ul>
+                    <p>After list.</p>
+                    """);
+    }
+
+    @Test
+    public void testMarkdownList2(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// Before list.
+                    ///
+                    /// - item 1
+                    /// - item 2
+                    /// - item 3
+                    ///
+                    /// After list.
+                    public class C { }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOrder("p/C.html",
+                """
+                    <p>Before list.</p>
+                    <ul>
+                    <li>item 1</li>
+                    <li>item 2</li>
+                    <li>item 3</li>
+                    </ul>
+                    <p>After list.</p>
+                    """);
+    }
+
+    @Test
+    public void testFont(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// Regular, `Monospace`, _italic_, and **bold** font.
+                    public class C { }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    Regular, <code>Monospace</code>, <em>italic</em>, and <strong>bold</strong> font.""");
+    }
+
+    @Test
+    public void testFFFC(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// First sentence. 1{@code 1}1 \ufffc 2{@code 2}2
+                    public class C { }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    <div class="block">First sentence. 1<code>1</code>1 \ufffc 2<code>2</code>2</div>
+                    """);
+    }
+
+    @Test
+    public void testEscape(Path base) throws Exception {
+        Path src = base.resolve("src");
+
+        tb.writeJavaFiles(src,
+                // In the following, note the need to double the escape character,
+                // so that the comment contains a single escape to precede the backtick.
+                // Also, note that because the first backtick is escaped, the comment
+                // is as-if there are two unmatched backticks, with an inline tag
+                // between them, and not a code span enclosing literal text.
+                """
+                    package p;
+                    public class C {
+                        /// Abc \\` def {@code xyz} ghi ` jkl.
+                        /// More.
+                        public void m() { }
+                    }
+                    """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput("p/C.html", true,
+                """
+                    <span class="element-name">m</span>()</div>
+                    <div class="block">Abc ` def <code>xyz</code> ghi ` jkl.
+                    More.</div>""");
+    }
+
+    @Test
+    public void testBacktickAt(Path base) throws Exception {
+        Path src = base.resolve("src");
+
+        // in the following, note that the @ following the backtick
+        // is just a literal character and not part of any tag
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// First sentence.
+                        /// Abc `@' def.
+                        /// More.
+                        public void m() { }
+                    }
+                    """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:syntax", // enable check for "no tag after '@'
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput(Output.OUT, false,
+                "C.java:4: error: no tag name after '@'",
+                "unknown tag");
+
+        checkOutput("p/C.html", true,
+                """
+                    <div class="block">First sentence.
+                    Abc `@' def.
+                    More.</div>
+                    </div>""");
+    }
+
+    @Test
+    public void testAnnos(Path base) throws Exception {
+        Path src = base.resolve("src");
+
+        // in the following, note that the @ following the backtick
+        // is just a literal character and not part of any tag
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// First sentence.
+                        /// 1.  list item
+                        ///
+                        ///     \\@Anno1 plain
+                        ///
+                        ///     abc `
+                        ///     @Anno2 in span
+                        ///     `
+                        ///
+                        ///     ```
+                        ///     @Anno3 fenced
+                        ///     ```
+                        ///
+                        ///         @Anno4 indented
+                        ///
+                        ///     end of list item
+                        ///
+                        /// end
+                        public void m() { }
+                    }
+                    """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:syntax", // enable check for "no tag after '@'
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput(Output.OUT, false,
+                "C.java:4: error: no tag name after '@'",
+                "unknown tag");
+
+        checkOutput("p/C.html", true,
+                """
+                    <ol>
+                    <li>
+                    <p>list item</p>
+                    <p>@Anno1 plain</p>
+                    <p>abc <code>@Anno2 in span</code></p>
+                    <pre><code>@Anno3 fenced
+                    </code></pre>
+                    <pre><code>@Anno4 indented
+                    </code></pre>
+                    <p>end of list item</p>
+                    </li>
+                    </ol>
+                    <p>end</p>
+                    """);
+
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownCodeBlocks.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownCodeBlocks.java
new file mode 100644
index 00000000000..8f1c76b9e47
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownCodeBlocks.java
@@ -0,0 +1,489 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdownCodeBlocks
+ */
+
+import java.nio.file.Path;
+import java.util.Locale;
+import java.util.stream.Collectors;
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+/**
+ * Tests Markdown code blocks.
+ *
+ * Code blocks may be either "fenced code blocks" or "indented code blocks".
+ * Within a code block, all text is "literal text" and not interpreted as
+ * Markdown, HTML or javadoc tags.
+ *
+ * In the various test cases, javadoc tags are used as a way to determine
+ * if the parser is correctly interpreting the text in its surrounding context.
+ * Within a code block, character sequences resembling a tag are treated as
+ * literal text, and appear "as is" in the generated output. Outside a
+ * code block, character sequences resembling a tag are treated as tags and
+ * are translated as appropriate in the generated output.
+ *
+ * A primary consideration in the test cases is use and handling of indentation,
+ * especially as it relates to lists and nested lists.
+ */
+public class TestMarkdownCodeBlocks extends JavadocTester {
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownCodeBlocks();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testCodeBlocks(Path base) throws Exception {
+        // Test cases provide a fragment of content for a documentation comment
+        // and a corresponding fragment of content to be found in the generated output.
+        // The name of each member is used to generate the name of a declaration
+        // with which the documentation comment is associated.
+        enum TestCase {
+            SIMPLE_INDENT(
+                    """
+
+                            {@code CODE}
+                            @Anno
+
+                        end""",
+                    """
+                        <pre><code>{@code CODE}
+                        @Anno
+                        </code></pre>
+                        <p>end</p>"""),
+
+            SIMPLE_FENCE_BACKTICK(
+                    """
+                        ```
+                        {@code CODE}
+                        @Anno
+                        ```
+                        end""",
+                    """
+                        <pre><code>{@code CODE}
+                        @Anno
+                        </code></pre>
+                        <p>end</p>"""),
+
+            SIMPLE_FENCE_TILDE(
+                    """
+                        ~~~
+                        {@code CODE}
+                        @Anno
+                        ~~~
+                        end""",
+                    """
+                        <pre><code>{@code CODE}
+                        @Anno
+                        </code></pre>
+                        <p>end</p>"""),
+
+            INDENT_TABS(
+                    """
+
+                        \ttab
+                         \t1-space tab
+                          \t2-space tab
+                           \t3-space tab
+                            \t4-space tab
+                        \t\t2-tab
+
+                        end
+                        """,
+                    """
+                        <pre><code>tab
+                        1-space tab
+                        2-space tab
+                        3-space tab
+                        \t4-space tab
+                        \t2-tab
+                        </code></pre>
+                        <p>end</p>"""
+            ),
+
+            UNCLOSED_FENCE(
+                    """
+                        ```
+                        {@code}
+                        @Anno
+                        """,
+                    """
+                        <pre><code>{@code}
+                        @Anno
+                        </code></pre>"""
+            ),
+
+            LIST_INDENT(
+                    """
+                        * list item
+
+                              {@code CODE}
+                              @Anno
+
+                        end""",
+                    """
+                        <ul>
+                        <li>
+                        <p>list item</p>
+                        <pre><code>{@code CODE}
+                        @Anno
+                        </code></pre>
+                        </li>
+                        </ul>
+                        <p>end</p>"""),
+
+            LIST_FENCE_BACKTICK(
+                    """
+                        * list item
+                          ```
+                          {@code CODE}
+                          @Anno
+                          ```
+                        end""",
+                    """
+                        <ul>
+                        <li>list item
+                        <pre><code>{@code CODE}
+                        @Anno
+                        </code></pre>
+                        </li>
+                        </ul>
+                        <p>end</p>"""),
+
+            LIST_FENCE_TILDE(
+                    """
+                        1. list item
+                           ~~~
+                           {@code CODE}
+                           @Anno
+                           ~~~
+
+                        end""",
+                    """
+                        <ol>
+                        <li>list item
+                        <pre><code>{@code CODE}
+                        @Anno
+                        </code></pre>
+                        </li>
+                        </ol>
+                        <p>end</p>"""),
+
+            LIST_UNCLOSED_FENCE(
+                    """
+                        1.  list item
+                            ```
+                            fenced-code
+                            @Anno
+
+                        end""",
+                    """
+                        <ol>
+                        <li>list item
+                        <pre><code>fenced-code
+                        @Anno
+
+                        </code></pre>
+                        </li>
+                        </ol>
+                        <p>end</p>"""),
+
+            // in the following, note the indentation of the list item is 5 spaces
+            // and the block that follows is indented by just 4 spaces
+            POST_LIST_INDENT(
+                    """
+                         1.  list item
+
+                             second paragraph
+
+                            {@code CODE}
+                            @Anno
+
+                        end""",
+                    """
+                        <ol>
+                        <li>
+                        <p>list item</p>
+                        <p>second paragraph</p>
+                        </li>
+                        </ol>
+                        <pre><code>{@code CODE}
+                        @Anno
+                        </code></pre>
+                        <p>end</p>"""),
+
+            BLOCK_FENCE(
+                    """
+                        > ```
+                        > fenced code
+                        > @Anno
+                        > ```
+                        end""",
+                    """
+                        <blockquote>
+                        <pre><code>fenced code
+                        @Anno
+                        </code></pre>
+                        </blockquote>
+                        <p>end</p>"""),
+
+            BLOCK_UNCLOSED_FENCE(
+                    """
+                        > ```
+                        > fenced code
+                        > @Anno
+                        end""",
+                    """
+                        <blockquote>
+                        <pre><code>fenced code
+                        @Anno
+                        </code></pre>
+                        </blockquote>
+                        <p>end</p>"""),
+
+            NOT_INDENT_CONTINUATION(
+                    """
+
+                        paragraph
+                                indented continuation {@code CODE}
+                                more.
+
+                        end""",
+                    """
+                        <p>paragraph
+                        indented continuation <code>CODE</code>
+                        more.</p>
+                        <p>end</p>"""
+            ),
+
+            NOT_INDENT_IN_LIST(
+                    """
+                        1.  list item
+
+                            list para, not indented block
+                            {@code CODE}
+
+                        end""",
+                    """
+                        <ol>
+                        <li>
+                        <p>list item</p>
+                        <p>list para, not indented block
+                        <code>CODE</code></p>
+                        </li>
+                        </ol>
+                        <p>end</p>"""),
+
+            COMBO(
+                    """
+                        1. list item {@code TAG} lorem ipsum
+
+                           * nested list {@code TAG} lorem ipsum
+
+                               nested list para {@code TAG} lorem ipsum
+
+                                 nested indented block {@code TEXT} lorem ipsum
+
+                            outer list para {@code TAG} lorem ipsum
+                            ```
+                            outer list fenced block {@code TEXT} lorem ipsum
+                            ```
+
+                        end""",
+                    """
+                        <ol>
+                        <li>
+                        <p>list item <code>TAG</code> lorem ipsum</p>
+                        <ul>
+                        <li>
+                        <p>nested list <code>TAG</code> lorem ipsum</p>
+                        <p>nested list para <code>TAG</code> lorem ipsum</p>
+                        <pre><code>nested indented block {@code TEXT} lorem ipsum
+                        </code></pre>
+                        </li>
+                        </ul>
+                        <p>outer list para <code>TAG</code> lorem ipsum</p>
+                        <pre><code>outer list fenced block {@code TEXT} lorem ipsum
+                        </code></pre>
+                        </li>
+                        </ol>
+                        <p>end</p>"""
+            );
+
+            final String srcFragment;
+            final String expect;
+
+            TestCase(String srcFragment, String expect) {
+                this.srcFragment = srcFragment;
+                this.expect = expect;
+            }
+        }
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("""
+                    package p;
+                    /** Dummy. */
+                    public class C {
+                    private C() { }
+                    """);
+
+        for (var tc: TestCase.values()) {
+            sb.append("""
+                        /// First sentence.
+                        #FRAG#
+                        public void #NAME#() { }
+
+                    """
+                    .replace("#FRAG#", tc.srcFragment.lines()
+                            .map(l -> "/// " + l)
+                            .collect(Collectors.joining("\n    ")))
+                    .replace("#NAME#", tc.name().toLowerCase(Locale.ROOT)));
+        }
+
+        sb.append("}");
+
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, sb.toString());
+
+        javadoc("-d", base.resolve("api").toString(),
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput(Output.OUT, false,
+                "unknown tag");
+
+        for (var tc : TestCase.values()) {
+            out.println("Test case: " + tc);
+            checkOutput("p/C.html", true,
+                    """
+                        <span class="element-name">#NAME#</span>()</div>
+                        <div class="block"><p>First sentence.</p>
+                        #FRAG#
+                        </div>"""
+                            .replace("#NAME#", tc.name().toLowerCase(Locale.ROOT))
+                            .replace("#FRAG#", tc.expect));
+        }
+    }
+
+    @Test
+    public void testTypical(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// stand-in for the standard class, to avoid platform links
+                    public class NullPointerException extends RuntimeException  { }
+                    """,
+                """
+                    package p;
+                    /// A class containing examples of "typical" usages.
+                    public class C {
+                        ///
+                        /// Here is an example:
+                        ///
+                        ///     @Deprecated
+                        ///     public class Old { }
+                        ///
+                        /// Here are some more examples:
+                        ///
+                        /// 1.  ```
+                        ///     @Deprecated(forRemoval=true)
+                        ///     public class VeryOld { }
+                        ///     ```
+                        /// 2.  ```
+                        ///     public class C {
+                        ///         @Override
+                        ///         public boolean equals(Object other) {
+                        ///             return false;
+                        ///         }
+                        ///         @Override
+                        ///         public int hashCode() {
+                        ///             return 0;
+                        ///         }
+                        ///     }
+                        ///     ```
+                        ///
+                        /// @param other another instance
+                        /// @throws NullPointerException if other is {@code null}
+                        public C(C other) { }
+                    }
+                    """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput("p/C.html", true,
+                """
+                    <p>Here is an example:</p>
+                    <pre><code>@Deprecated
+                    public class Old { }
+                    </code></pre>""",
+
+                """
+                    <p>Here are some more examples:</p>
+                    <ol>
+                    <li>
+                    <pre><code>@Deprecated(forRemoval=true)
+                    public class VeryOld { }
+                    </code></pre>
+                    </li>
+                    <li>
+                    <pre><code>public class C {
+                        @Override
+                        public boolean equals(Object other) {
+                            return false;
+                        }
+                        @Override
+                        public int hashCode() {
+                            return 0;
+                        }
+                    }
+                    </code></pre>
+                    </li>
+                    </ol>""",
+
+                """
+                    <dl class="notes">
+                    <dt>Parameters:</dt>
+                    <dd><code>other</code> - another instance</dd>
+                    <dt>Throws:</dt>
+                    <dd><code><a href="NullPointerException.html" title="class in p">NullPointerException</a></code> - if other is <code>null</code></dd>
+                    </dl>""");
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownCodeSpans.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownCodeSpans.java
new file mode 100644
index 00000000000..9e2960972e1
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownCodeSpans.java
@@ -0,0 +1,391 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdownCodeSpans
+ */
+
+import java.nio.file.Path;
+import java.util.Locale;
+import java.util.stream.Collectors;
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+/**
+ * Tests Markdown code spans.
+ *
+ * Code spans are enclosed within a matching sequence of one or more backtick ({@code `})
+ * characters and provide a way to specify "literal text" within a block,
+ * such as a paragraph, list item, or block quote.  Code spans may span multiple lines
+ * but not cross block boundaries: if a sequence of backtick characters is not matched within
+ * a block, the sequence is treated as literal text, even if there is a matching sequence
+ * in a subsequent block.
+ *
+ * In the various test cases, javadoc tags are used as a way to determine
+ * if the parser is correctly interpreting the text in its surrounding context.
+ * Within a code span, character sequences resembling a tag are treated as
+ * literal text, and appear "as is" in the generated output. Outside a
+ * code span, character sequences resembling a tag are treated as tags and
+ * are translated as appropriate in the generated output.
+ *
+ * A primary consideration in the test cases is the use and handling of lines
+ * that may or may not be part of the same block.  As such, the source for
+ * each test case can be considered to be in two parts, each containing a backtick,
+ * and which may or may not represent a code span.  Note that only some kinds
+ * of lines (for paragraphs, list items and block quotes) may contain code spans.
+ * All kinds of lines either continue a block or terminate it.
+ */
+public class TestMarkdownCodeSpans extends JavadocTester {
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownCodeSpans();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testCodeSpans(Path base) throws Exception {
+        // Test cases provide a fragment of content for a documentation comment
+        // and a corresponding fragment of content to be found in the generated output.
+        // The name of each member is used to generate the name of a declaration
+        // with which the documentation comment is associated.
+        //
+        // In the source fragments:
+        // - when "{@code TEXT}" appears, it is expected it will appear "as is" in the output
+        //   enclosed within an HTML <code> element
+        // - when "{@code TAG}" appears, it is expected it will be treated as a tag
+        //   and will appear in the output as "<code>TAG</code>"
+        // Thus, the character sequence "{@code TAG}" should never appear in any output.
+        //
+        // Note: for test cases involving ATX and setext headings, care must be taken to
+        // ensure that the content is such that the auto-generated ids are unique,
+        // so that we do not depend on the doclet to disambiguate the ids, based on the
+        // order in which the headings are generated.
+        enum TestCase {
+            SIMPLE_PARA(
+                    """
+
+                        abc `p {@code TEXT} q` def
+
+                        end""",
+                    """
+                        <p>abc <code>p {@code TEXT} q</code> def</p>
+                        <p>end</p>"""),
+
+            // a multi-line code span
+            PARA_PARA(
+                    """
+
+                        abc `p {@code TEXT}
+                        q` def
+
+                        end""",
+                    """
+                        <p>abc <code>p {@code TEXT} q</code> def</p>
+                        <p>end</p>"""),
+
+            // a paragraph with a heavily indented continuation line,
+            // including a multi-line code span
+            PARA_INDENT(
+                    """
+
+                        abc `p {@code TEXT}
+                                      q` def
+
+                        end""",
+                    """
+                        <p>abc <code>p {@code TEXT} q</code> def</p>
+                        <p>end</p>"""),
+
+            // blank line after a paragraph; no code spans, the tag is processed
+            PARA_BLANK(
+                    """
+
+                        abc `p {@code TAG}
+
+                        q` def
+
+                        end""",
+                    """
+                        <p>abc `p <code>TAG</code></p>
+                        <p>q` def</p>
+                        <p>end</p>"""),
+
+            // thematic break after a paragraph; no code spans, the tag is processed
+            PARA_THEMATIC_BREAK_DASH(
+                    """
+
+                        abc `p {@code TAG}
+                        - - - - - - - - - - - -
+                        q` def
+
+                        end""",
+                    """
+                        <p>abc `p <code>TAG</code></p>
+                        <hr />
+                        <p>q` def</p>
+                        <p>end</p>"""),
+
+            // thematic break after a paragraph; no code spans, the tag is processed
+            PARA_THEMATIC_BREAK_ASTERISK(
+                    """
+
+                        abc `p {@code TAG}
+                        * * * * * * * * * *
+                        q` def
+
+                        end""",
+                    """
+                        <p>abc `p <code>TAG</code></p>
+                        <hr />
+                        <p>q` def</p>
+                        <p>end</p>"""),
+
+            // ATX heading after a paragraph; no code spans, the tag is processed
+            PARA_ATX(
+                    """
+
+                        abc `p1 {@code TAG}
+                        # q1` def
+
+                        end""",
+                    """
+                        <p>abc `p1 <code>TAG</code></p>
+                        <h4 id="q1-def-heading">q1` def</h4>
+                        <p>end</p>"""),
+
+            // setext heading; no code spans, the tag is processed
+            PARA_SETEXT(
+                    """
+
+                        abc `p {@code TAG}
+                        ===================
+                        q` def
+
+                        end""",
+                    """
+                        <h4 id="abc-p--heading">abc `p <code>TAG</code></h4>
+                        <p>q` def</p>
+                        <p>end</p>"""),
+
+            SIMPLE_LIST(
+                    """
+
+                        * abc `p {@code TEXT} q` def
+
+                        end""",
+                    """
+                        <ul>
+                        <li>abc <code>p {@code TEXT} q</code> def</li>
+                        </ul>
+                        <p>end</p>"""),
+
+            // two list items; no code spans, the tag is processed
+            LIST_LIST(
+                    """
+
+                        * abc `p {@code TAG}
+                        * q` def
+
+                        end""",
+                    """
+                        <ul>
+                        <li>abc `p <code>TAG</code></li>
+                        <li>q` def</li>
+                        </ul>
+                        <p>end</p>"""),
+
+            // a multi-line code span in a multi-line list item
+            LIST_PARA(
+                    """
+
+                        * abc `p {@code TEXT}
+                        q` def
+
+                        end""",
+                    """
+                <ul>
+                <li>abc <code>p {@code TEXT} q</code> def</li>
+                </ul>
+                <p>end</p>"""),
+
+            // a list item with a heavily indented continuation line,
+            // including a multi-line code span
+            LIST_INDENT(
+                    """
+
+                        * abc `p {@code TEXT}
+                                      q` def
+
+                        end""",
+                    """
+                <ul>
+                <li>abc <code>p {@code TEXT} q</code> def</li>
+                </ul>
+                <p>end</p>"""),
+
+            SIMPLE_BLOCKQUOTE(
+                    """
+
+                        > abc `p {@code TEXT} q` def
+
+                        end""",
+                    """
+                        <blockquote>
+                        <p>abc <code>p {@code TEXT} q</code> def</p>
+                        </blockquote>
+                        <p>end</p>"""),
+
+            // a multi-line code span in a multi-line block quote
+            BLOCKQUOTE_BLOCKQUOTE(
+                    """
+
+                        > abc `p {@code TEXT}
+                        > q` def
+
+                        end""",
+                    """
+                        <blockquote>
+                        <p>abc <code>p {@code TEXT} q</code> def</p>
+                        </blockquote>
+                        <p>end</p>"""),
+
+            // a multi-line code span in a multi-line block quote
+            BLOCKQUOTE_PARA(
+                    """
+
+                        > abc `p {@code TEXT}
+                          q` def
+
+                        end""",
+                            """
+                        <blockquote>
+                        <p>abc <code>p {@code TEXT} q</code> def</p>
+                        </blockquote>
+                        <p>end</p>"""),
+
+            // a block quote with a heavily indented continuation line,
+            // including a multi-line code span
+            BLOCKQUOTE_INDENT(
+                    """
+
+                        > abc `p {@code TEXT}
+                                    q` def
+
+                        end""",
+                    """
+                <blockquote>
+                <p>abc <code>p {@code TEXT} q</code> def</p>
+                </blockquote>
+                <p>end</p>"""),
+
+            SIMPLE_ATX(
+                    """
+
+                        # abc `p2 {@code TEXT} q2` def
+
+                        end""",
+                    """
+                        <h4 id="abc-p2-code-text-q2-def-heading">abc <code>p2 {@code TEXT} q2</code> def</h4>
+                        <p>end</p>"""),
+
+            // two ATX headings; no code spans, the tag is processed
+            ATX_ATX(
+                    """
+
+                        # abc `p3 {@code TAG}
+                        # q3` def
+
+                        end""",
+                    """
+                        <h4 id="abc-p3--heading">abc `p3 <code>TAG</code></h4>
+                        <h4 id="q3-def-heading">q3` def</h4>
+                        <p>end</p>""");
+
+            final String srcFragment;
+            final String expect;
+
+            TestCase(String srcFragment, String expect) {
+                this.srcFragment = srcFragment;
+                this.expect = expect;
+            }
+        }
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("""
+                    package p;
+                    /** Dummy. */
+                    public class C {
+                    private C() { }
+                    """);
+
+        for (var tc: TestCase.values()) {
+            sb.append("""
+                        /// First sentence.
+                        #FRAG#
+                        public void #NAME#() { }
+
+                    """
+                    .replace("#FRAG#", tc.srcFragment.lines()
+                            .map(l -> "/// " + l)
+                            .collect(Collectors.joining("\n    ")))
+                    .replace("#NAME#", tc.name().toLowerCase(Locale.ROOT)));
+        }
+
+        sb.append("}");
+
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, sb.toString());
+
+        javadoc("-d", base.resolve("api").toString(),
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        // any/all instances of "{@code TAG}" should be translated to "<code>TAG</code>"
+        checkOutput("p/C.html", false,
+                "{@code TAG}");
+
+        checkOutput(Output.OUT, false,
+                "unknown tag");
+
+        for (var tc : TestCase.values()) {
+            checkOutput("p/C.html", true,
+                    """
+                        <span class="element-name">#NAME#</span>()</div>
+                        <div class="block"><p>First sentence.</p>
+                        #FRAG#
+                        </div>"""
+                            .replace("#NAME#", tc.name().toLowerCase(Locale.ROOT))
+                            .replace("#FRAG#", tc.expect));
+        }
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownDeprecated.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownDeprecated.java
new file mode 100644
index 00000000000..9f91ecf34e8
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownDeprecated.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdownDeprecated
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class TestMarkdownDeprecated extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownDeprecated();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testDeprecated(Path base) throws Exception {
+        Path src = base.resolve("src");
+
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class Control {
+                        /**
+                         * First sentence. Second sentence.
+                         */
+                         @Deprecated
+                         public void anno_noTag() { }
+                        /**
+                         * First sentence. Second sentence.
+                         * @deprecated deprecated-text
+                         */
+                         public void noAnno_tag() { }
+                        /**
+                         * First sentence. Second sentence.
+                         * @deprecated deprecated-text
+                         */
+                        @Deprecated
+                        public void anno_tag() { }
+                    }""",
+                """
+                    package p;
+                    public class MarkdownComments {
+                        /// First sentence. Second sentence.
+                        @Deprecated
+                        public void anno_noTag() { }
+                        /// First sentence. Second sentence.
+                        /// @deprecated deprecated-text.
+                        public void noAnno_tag() { }
+                        /// First sentence. Second sentence.
+                        /// @deprecated deprecated-text
+                        @Deprecated
+                        public void anno_tag() { }
+                    }""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        // Note: javadoc does not generate warnings about any mismatch
+        // between @Deprecated annotations and @deprecated tags:
+        // the mismatch is detected and reported by javac Attr phase,
+        // when enabled by -Xlint:dep-ann.
+
+        // the output for these two files should be the same, except where it is not
+        for (var f : List.of("p/Control.html", "p/MarkdownComments.html")) {
+            // in the following checks we check from the signature,
+            // beginning at the name, through to the end of the main description.
+            checkOutput(f, true,
+                    """
+                        <span class="element-name">anno_noTag</span>()</div>
+                        <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+                        <div class="block">First sentence. Second sentence.</div>""",
+
+                    switch (f) {
+                        // @deprecated but no annotation in a traditional comment implies deprecation
+                        case "p/Control.html" -> """
+                            <span class="element-name">noAnno_tag</span>()</div>
+                            <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
+                            <div class="deprecation-comment">deprecated-text</div>
+                            </div>
+                            <div class="block">First sentence. Second sentence.</div>""";
+
+                        // @deprecated but no annotation in a Markdown comment does not imply deprecation
+                        case "p/MarkdownComments.html" -> """
+                            <span class="element-name">noAnno_tag</span>()</div>
+                            <div class="block">First sentence. Second sentence.</div>""";
+
+                        default -> throw new Error();
+                    },
+
+                    """
+                        <span class="element-name">anno_tag</span>()</div>
+                        <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
+                        <div class="deprecation-comment">deprecated-text</div>
+                        </div>
+                        <div class="block">First sentence. Second sentence.</div>""");
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownEntities.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownEntities.java
new file mode 100644
index 00000000000..c1ce6954c5f
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownEntities.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug      8332545
+ * @summary  Fix handling of HTML5 entities in Markdown comments
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdownEntities
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+
+/**
+ * Tests for use of HTML5 entities in Markdown.
+ */
+public class TestMarkdownEntities extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownEntities();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testEntities(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// Simple common &lt;entities&gt; &amp;
+                    /// less common &ldquo;entities&rdquo;.
+                    public class C {
+                        private C() { }
+                    }
+                    """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    <div class="block">Simple common &lt;entities&gt; &amp;
+                    less common \u201centities\u201d.</div>
+                    """);
+
+    }
+
+}
\ No newline at end of file
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownFiles.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownFiles.java
new file mode 100644
index 00000000000..1d1499e4549
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownFiles.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdownFiles
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class TestMarkdownFiles extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownFiles();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testDocFile(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                package p;
+                /// First sentence.
+                public class C { }
+                """);
+        tb.writeFile(src.resolve("p").resolve("doc-files").resolve("markdown.md"),
+                """
+                # This is a _Markdown_ heading
+
+                Lorem ipsum""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/doc-files/markdown.html", true,
+                """
+                    <title>This is a Markdown heading</title>
+                    """,
+                """
+                    <main role="main"><h1 id="this-is-a-markdown-heading-heading1">This is a <em>Markdown</em> heading</h1>
+                    <p>Lorem ipsum</p>
+                    </main>
+                    """);
+    }
+
+    @Test
+    public void testOverview(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                package p;
+                /// First sentence.
+                public class C { }
+                """);
+        var overviewFile = src.resolve("overview.md");
+        tb.writeFile(overviewFile,
+                """
+                This is a _Markdown_ overview.
+                Lorem ipsum""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "-overview", overviewFile.toString(),
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("index.html", true,
+                """
+                    <div class="block">This is a <em>Markdown</em> overview.
+                    Lorem ipsum</div>""");
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownFirstSentence.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownFirstSentence.java
new file mode 100644
index 00000000000..88414d2225e
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownFirstSentence.java
@@ -0,0 +1,274 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdownFirstSentence
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class TestMarkdownFirstSentence extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownFirstSentence();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testFirstSentence(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// This is the _first_ sentence.
+                        /// This is the _second_ sentence.
+                         public void m() { }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOrder("p/C.html",
+                """
+                    <section class="method-summary" id="method-summary">""",
+                """
+                    <div class="block">This is the <em>first</em> sentence.</div>""",
+                """
+                    <section class="method-details" id="method-detail">""",
+                """
+                    <div class="block">This is the <em>first</em> sentence.
+                    This is the <em>second</em> sentence.</div>""");
+    }
+
+    // Test the ability to put links in the first sentence of a description.
+    // Note that user-defined reference links cannot be used in the first
+    // sentence, and so in that case we verify the behavior is "as expected".
+    @Test
+    public void testFirstSentenceLinks(Path base) throws Exception {
+        Path src = base.resolve("src");
+
+        // Apart from the (control) case, the other cases exercise
+        // various kinds of links in the first sentence of a description.
+        // Note the last case is an explicit test of a link that is
+        // _not_ currently supported, since the link reference definition
+        // is not part of the first sentence.
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    import q.MyObject;
+                    public class C {
+                        /// First sentence.
+                        /// Control: [MyObject]
+                        public void m1() { }
+
+                        /// Simple autoref in first sentence [MyObject].
+                        /// More.
+                        public void m2() { }
+
+                        /// Qualified autoref in first sentence [q.MyObject].
+                        /// More.
+                        public void m3() { }
+
+                        /// Standard link with periods [example.com](http://example.com).
+                        /// More.
+                        public void m4() { }
+
+                        /// Manual ref link [foo].
+                        /// More.
+                        ///
+                        /// [foo]: http:example.com
+                        public void m5() { }
+                    }""",
+                // use a simple class in a different package, to avoid platform links to system classes
+                """
+                    package q;
+                    public class MyObject { }""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p", "q");
+        checkExit(Exit.OK);
+
+        // use checkOrder and the delimiter comments to ensure that
+        // we check the strings in the method summary table, and not
+        // subsequently in the method details section.
+        checkOrder("p/C.html",
+                "<!-- ========== METHOD SUMMARY =========== -->",
+                """
+                    <div class="block">Simple autoref in first sentence <a href="../q/MyObject.html" \
+                    title="class in q"><code>MyObject</code></a>.</div>""",
+                """
+                    <div class="block">Qualified autoref in first sentence <a href="../q/MyObject.html" \
+                    title="class in q"><code>MyObject</code></a>.</div>""",
+                """
+                    <div class="block">Standard link with periods \
+                    <a href="http://example.com">example.com</a>.</div>""",
+                // The following is a test of the regrettably expected behavior,
+                // because the link reference definition is not carried into
+                // the first sentence.
+                """
+                    <div class="block">Manual ref link [foo].</div>""",
+                "<!-- ============ METHOD DETAIL ========== -->"
+        );
+    }
+
+    // Test that periods within certain constructs do not prematurely terminate
+    // the first sentence.
+    @Test
+    public void testFirstSentencePeriods(Path base) throws Exception {
+        testFirstSentencePeriods(base.resolve("no-bi"), false);
+        testFirstSentencePeriods(base.resolve("bi"), true);
+    }
+
+    void testFirstSentencePeriods(Path base, boolean useBreakIterator) throws Exception {
+        Path src = base.resolve("src");
+
+        tb.writeJavaFiles(src,
+                """
+                        package p;
+                        public class C {
+                            /// Code span `1.0` end.
+                            /// More.
+                            public void m1() { }
+                            /// Complex code span ``` `1.0` ``` end.
+                            /// More.
+                            public void m2() { }
+                            /// Period space `1.  2.  3.` end.
+                            /// More.
+                            public void m3() { }
+                            /// Link [example.com](http://example.com) end.
+                            /// More.
+                            public void m4() { }
+                        }
+                        """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                (useBreakIterator ? "-breakiterator" : "-XDdummy"),
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        // use checkOrder and the delimiter comments to ensure that
+        // we check the strings in the method summary table, and not
+        // subsequently in the method details section.
+        checkOrder("p/C.html",
+                "<!-- ========== METHOD SUMMARY =========== -->",
+                """
+                    <div class="block">Code span <code>1.0</code> end.</div>""",
+                """
+                    <div class="block">Complex code span <code>`1.0`</code> end.</div>""",
+                """
+                    <div class="block">Period space <code>1.  2.  3.</code> end.</div>""",
+                """
+                    <div class="block">Link <a href="http://example.com">example.com</a> end.</div>""",
+                "<!-- ============ METHOD DETAIL ========== -->"
+        );
+    }
+
+    @Test
+    public void testIndentedInlineReturn(Path base) throws Exception {
+        //this is a Markdown-specific test, because leading whitespace is ignored in HTML comments
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// Class description.
+                    public class C {
+                        ///    {@return an int}
+                        /// More description.
+                        public int m() { return 0; }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    <section class="detail" id="m()">
+                    <h3>m</h3>
+                    <div class="horizontal-scroll">
+                    <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">m</span>()</div>
+                    <div class="block">Returns an int.
+                    More description.</div>
+                    <dl class="notes">
+                    <dt>Returns:</dt>
+                    <dd>an int</dd>
+                    </dl>
+                    </div>
+                    </section>""");
+    }
+
+    @Test
+    public void testExtraPara(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// This is the class description.
+                    ///
+                    /// # Heading
+                    /// Lorem ipsum
+                    public class C { }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/package-summary.html", true,
+                """
+                    <div class="col-first even-row-color class-summary class-summary-tab2"><a href="C.html" title="clas\
+                    s in p">C</a></div>
+                    <div class="col-last even-row-color class-summary class-summary-tab2">
+                    <div class="block">This is the class description.</div>
+                    </div>""");
+
+        checkOutput("p/C.html", true,
+                """
+                        <span class="element-name type-name-label">C</span>
+                        <span class="extends-implements">extends java.lang.Object</span></div>
+                        <div class="block"><p>This is the class description.</p>
+                        <h2 id="heading-heading">Heading</h2>
+                        <p>Lorem ipsum</p>
+                        </div>""");
+
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownHeadings.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownHeadings.java
new file mode 100644
index 00000000000..8d5c782a66b
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownHeadings.java
@@ -0,0 +1,344 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdownHeadings
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+
+/**
+ * Tests for Markdown headings.
+ *
+ * Markdown headings are handled specially when rendering the content.
+ * In particular:
+ * 1. heading levels are adjusted according to the context
+ * 2. ids are automatically added
+ * 3. top-level headings are added to the TOC
+ *
+ * Note that ids on headings are always automatically generated.
+ * You cannot specify ids, such as with the pandoc header-attributes
+ * extension.
+ */
+public class TestMarkdownHeadings extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownHeadings();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testHeading_ATX(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    /// First sentence.
+                    ///
+                    /// # ATX-style heading for package
+                    ///
+                    /// Lorem ipsum.
+                    ///
+                    /// ## ATX-style subheading for package
+                    ///
+                    /// Lorem ipsum.
+                    package p;
+                    """,
+                """
+                    package p;
+                    /// First sentence.
+                    ///
+                    /// # ATX-style heading for class
+                    ///
+                    /// Lorum ipsum.
+                    ///
+                    /// ## ATX-style subheading for class
+                    ///
+                    /// Lorem ipsum.
+                    public class C {
+                        /// Constructor.
+                        ///
+                        /// # ATX-style heading for executable
+                        ///
+                        /// Lorem ipsum.
+                        ///
+                        /// ## ATX-style subheading for executable
+                        ///
+                        /// Lorem ipsum.
+                        public C() { }
+                    }
+                    """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/package-summary.html", true,
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <h2 id="atx-style-heading-for-package-heading">ATX-style heading for package</h2>
+                    <p>Lorem ipsum.</p>
+                    <h3 id="atx-style-subheading-for-package-heading">ATX-style subheading for package</h3>
+                    <p>Lorem ipsum.</p>
+                    </div>""");
+
+        checkOutput("p/C.html", true,
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <h2 id="atx-style-heading-for-class-heading">ATX-style heading for class</h2>
+                    <p>Lorum ipsum.</p>
+                    <h3 id="atx-style-subheading-for-class-heading">ATX-style subheading for class</h3>
+                    <p>Lorem ipsum.</p>
+                    </div>
+                    """, """
+                    <div class="block"><p>Constructor.</p>
+                    <h4 id="atx-style-heading-for-executable-heading">ATX-style heading for executable</h4>
+                    <p>Lorem ipsum.</p>
+                    <h5 id="atx-style-subheading-for-executable-heading">ATX-style subheading for executable</h5>
+                    <p>Lorem ipsum.</p>
+                    </div>
+                    """);
+
+    }
+
+    @Test
+    public void testHeading_Setext(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    /// First sentence.
+                    ///
+                    /// Setext-style heading for package
+                    /// ================================
+                    ///
+                    /// Lorem ipsum.
+                    ///
+                    /// Setext-style subheading for package
+                    /// -----------------------------------
+                    ///
+                    /// Lorem ipsum.
+                    package p;
+                    """,
+                """
+                    package p;
+                    /// First sentence.
+                    ///
+                    /// Setext-style heading for class
+                    /// ==============================
+                    ///
+                    /// Lorum ipsum.
+                    ///
+                    /// Setext-style subheading for class
+                    /// ---------------------------------
+                    ///
+                    /// Lorem ipsum.
+                    public class C {
+                        /// Constructor.
+                        ///
+                        /// Setext-style heading for executable
+                        /// ===================================
+                        ///
+                        /// Lorem ipsum.
+                        ///
+                        /// Setext-style subheading for executable
+                        /// --------------------------------------
+                        ///
+                        /// Lorem ipsum.
+                        public C() { }
+                    }
+                    """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/package-summary.html", true,
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <h2 id="setext-style-heading-for-package-heading">Setext-style heading for package</h2>
+                    <p>Lorem ipsum.</p>
+                    <h3 id="setext-style-subheading-for-package-heading">Setext-style subheading for package</h3>
+                    <p>Lorem ipsum.</p>
+                    </div>""");
+
+        checkOutput("p/C.html", true,
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <h2 id="setext-style-heading-for-class-heading">Setext-style heading for class</h2>
+                    <p>Lorum ipsum.</p>
+                    <h3 id="setext-style-subheading-for-class-heading">Setext-style subheading for class</h3>
+                    <p>Lorem ipsum.</p>
+                    </div>
+                    """, """
+                    <div class="block"><p>Constructor.</p>
+                    <h4 id="setext-style-heading-for-executable-heading">Setext-style heading for executable</h4>
+                    <p>Lorem ipsum.</p>
+                    <h5 id="setext-style-subheading-for-executable-heading">Setext-style subheading for executable</h5>
+                    <p>Lorem ipsum.</p>
+                    </div>
+                    """);
+    }
+
+    @Test
+    public void testMaxHeadings(Path base) throws Exception {
+
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// First sentence.
+                    ///
+                    /// # Level 1 heading for class
+                    /// ## Level 2 subheading for class
+                    /// ### Level 3 subheading for class
+                    /// #### Level 4 heading for class
+                    /// ##### Level 5 subheading for class
+                    /// ###### Level 6 subheading for class
+                    ///
+                    /// Lorem ipsum.
+                    public class C {
+                        /// Constructor.
+                        ///
+                        /// # Level 1 heading for member
+                        /// ## Level 2 subheading for member
+                        /// ### Level 3 subheading for member
+                        /// #### Level 4 heading for member
+                        /// ##### Level 5 subheading for member
+                        /// ###### Level 6 subheading for member
+                        ///
+                        /// Lorem ipsum.
+                        public C() { }
+                    }
+                    """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+        checkOutput("p/C.html", true,
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <h2 id="level-1-heading-for-class-heading">Level 1 heading for class</h2>
+                    <h3 id="level-2-subheading-for-class-heading">Level 2 subheading for class</h3>
+                    <h4 id="level-3-subheading-for-class-heading">Level 3 subheading for class</h4>
+                    <h5 id="level-4-heading-for-class-heading">Level 4 heading for class</h5>
+                    <h6 id="level-5-subheading-for-class-heading">Level 5 subheading for class</h6>
+                    <h6 id="level-6-subheading-for-class-heading">Level 6 subheading for class</h6>
+                    <p>Lorem ipsum.</p>
+                    </div>""",
+                """
+                    <div class="block"><p>Constructor.</p>
+                    <h4 id="level-1-heading-for-member-heading">Level 1 heading for member</h4>
+                    <h5 id="level-2-subheading-for-member-heading">Level 2 subheading for member</h5>
+                    <h6 id="level-3-subheading-for-member-heading">Level 3 subheading for member</h6>
+                    <h6 id="level-4-heading-for-member-heading">Level 4 heading for member</h6>
+                    <h6 id="level-5-subheading-for-member-heading">Level 5 subheading for member</h6>
+                    <h6 id="level-6-subheading-for-member-heading">Level 6 subheading for member</h6>
+                    <p>Lorem ipsum.</p>
+                    </div>""");
+    }
+
+    @Test
+    public void testHeading_TOC(Path base) throws Exception {
+        Path src = base.resolve("src");
+
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// First sentence.
+                    ///
+                    /// # ATX heading `code` _underline_ text
+                    ///
+                    /// Lorem ipsum
+                    ///
+                    /// ## ATX Subheading
+                    ///
+                    /// Lorem ipsum
+                    ///
+                    /// Setext heading
+                    /// ==============
+                    ///
+                    /// Lorem ipsum
+                    ///
+                    /// Setext subheading
+                    /// ------------------
+                    ///
+                    /// Lorem ipsum
+                    public class C {
+                        /// Method m.
+                        /// # subheading in m()
+                        ///
+                        /// Lorem ipsum
+                        public void m() { }
+                    }""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput("p/C.html", true,
+                // note only the level 1 headings in the class description
+                """
+                    <div class="toc-header">Contents&nbsp;
+                    <input type="text" class="filter-input" disabled placeholder="Filter" aria-label="Filter table of contents" autocomplete="off">
+                    <input type="reset" class="reset-filter" disabled value="Reset">
+                    </div>
+                    <button class="hide-sidebar"><span>Hide sidebar&nbsp;</span>&#10094;</button><button class="show-sidebar">&#10095;<span>&nbsp;Show sidebar</span></button>
+                    <ol class="toc-list">
+                    <li><a href="#" tabindex="0">Description</a>
+                    <ol class="toc-list">
+                    <li><a href="#atx-heading-code-underline-text-heading" tabindex="0">ATX heading code underline text</a></li>
+                    <li><a href="#setext-heading-heading" tabindex="0">Setext heading</a></li>
+                    </ol>
+                    </li>
+                    <li><a href="#constructor-summary" tabindex="0">Constructor Summary</a></li>
+                    <li><a href="#method-summary" tabindex="0">Method Summary</a></li>
+                    <li><a href="#constructor-detail" tabindex="0">Constructor Details</a>
+                    <ol class="toc-list">
+                    <li><a href="#%3Cinit%3E()" tabindex="0">C()</a></li>
+                    </ol>
+                    </li>
+                    <li><a href="#method-detail" tabindex="0">Method Details</a>
+                    <ol class="toc-list">
+                    <li><a href="#m()" tabindex="0">m()</a></li>
+                    </ol>
+                    </li>
+                    </ol>
+                    """);
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownInheritDoc.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownInheritDoc.java
new file mode 100644
index 00000000000..67d1e3f7265
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownInheritDoc.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdownInheritDoc
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class TestMarkdownInheritDoc extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownInheritDoc();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testInherit_md_md(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class Base {
+                        /// Markdown comment.
+                        /// @throws Exception Base _Markdown_
+                        public void m() throws Exception { }
+                    }""",
+                """
+                    package p;
+                    public class Derived extends Base {
+                        /// Markdown comment.
+                        /// @throws {@inheritDoc}
+                        public void m() throws Exception { }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/Derived.html", true,
+                """
+                    <dt>Throws:</dt>
+                    <dd><code>java.lang.Exception</code> - Base <em>Markdown</em></dd>
+                    """);
+    }
+
+    @Test
+    public void testInherit_md_plain(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class Base {
+                        /// Markdown comment.
+                        /// @throws Exception Base _Markdown_
+                        public void m() throws Exception { }
+                    }""",
+                """
+                    package p;
+                    public class Derived extends Base {
+                        /**
+                         * Plain comment.
+                         * @throws {@inheritDoc}
+                         */
+                         public void m() throws Exception { }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/Derived.html", true,
+                """
+                    <dt>Throws:</dt>
+                    <dd><code>java.lang.Exception</code> - Base <em>Markdown</em></dd>
+                    """);
+    }
+
+    @Test
+    public void testInherit_plain_md(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class Base {
+                        /**
+                         * Plain comment.
+                         * @throws Exception Base _Not Markdown_
+                         */
+                         public void m() throws Exception { }
+                    }""",
+                """
+                    package p;
+                    public class Derived extends Base {
+                        /// Markdown comment.
+                        /// @throws {@inheritDoc}
+                        public void m() throws Exception { }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/Derived.html", true,
+                """
+                    <dt>Throws:</dt>
+                    <dd><code>java.lang.Exception</code> - Base _Not Markdown_</dd>
+                    """);
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownLinks.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownLinks.java
new file mode 100644
index 00000000000..7bfb17d6864
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownLinks.java
@@ -0,0 +1,349 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdownLinks
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class TestMarkdownLinks extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownLinks();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testSimpleLink(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// Method m1.
+                        /// This is different from {@link #m2()}.
+                        public void m1() { }
+                        /// Method m2.
+                        /// This is different from {@link #m1()}.
+                        public void m2() { }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    Method m1.
+                    This is different from <a href="#m2()"><code>m2()</code></a>.""");
+
+    }
+
+    @Test
+    public void testSimpleRefLink(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// Method m1.
+                        /// This is different from [#m2()].
+                        public void m1() { }
+                        /// Method m2.
+                        /// This is different from [#m1()].
+                        public void m2() { }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    Method m1.
+                    This is different from <a href="#m2()"><code>m2()</code></a>.""");
+
+    }
+
+    @Test
+    public void testLinkWithDescription(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// Method m1.
+                        /// This is different from {@linkplain #m2() _Markdown_ m2}.
+                        public void m1() { }
+                        /// Method m2.
+                        /// This is different from {@linkplain #m1() _Markdown_ m1}.
+                        public void m2() { }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    Method m1.
+                    This is different from <a href="#m2()"><em>Markdown</em> m2""");
+
+    }
+
+    @Test
+    public void testRefLinkWithDescription(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// Method m1.
+                        /// This is different from [_Markdown_ m2][#m2()].
+                        public void m1() { }
+                        /// Method m2.
+                        /// This is different from [_Markdown_ m1][#m1()]}.
+                        public void m2() { }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    Method m1.
+                    This is different from <a href="#m2()"><em>Markdown</em> m2""");
+
+    }
+
+    @Test
+    public void testLinkToHeadingAnchor(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// Method m1.
+                        /// # Lorem Ipsum.
+                        ///
+                        /// Lorem ipsum [reference in same comment][##lorem-ipsum--heading].
+                        public void m1() { }
+                        /// Method m2.
+                        /// Lorem ipsum [reference in another comment][##lorem-ipsum--heading].
+                        public void m2() { }
+                    }
+                    """,
+                """
+                    package p;
+                    /// Lorem ipsum [reference in another class][C##lorem-ipsum--heading].
+                    public class D {
+                    }""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+    }
+
+    @Test
+    public void testLinkToUserAnchor(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// Method m1.
+                        /// <span id="lorem-ipsum">Lorem Ipsum</span>.
+                        ///
+                        /// Lorem ipsum [reference in same comment][##lorem-ipsum].
+                        public void m1() { }
+                        /// Method m2.
+                        /// Lorem ipsum [reference in another comment][##lorem-ipsum].
+                        public void m2() { }
+                    }
+                    """,
+                """
+                    package p;
+                    /// Lorem ipsum [reference in another class][C##lorem-ipsum].
+                    public class D {
+                    }""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+    }
+
+    @Test
+    public void testLinkElementKinds(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                        package p;
+                        /// First sentence.
+                        ///
+                        /// * module [java.base/]
+                        /// * package [java.util]
+                        /// * class [String] or interface [Runnable]
+                        /// * a field [String#CASE_INSENSITIVE_ORDER]
+                        /// * a constructor [String#String()]
+                        /// * a method [String#chars()]
+                        public class C { }""");
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        // in the following carefully avoid checking the URL host, which is of less importance and may vary over time;
+        // the interesting part is the tail of the path after the host
+        new OutputChecker("p/C.html")
+                .setExpectOrdered(true)
+                .check("module <a href=\"https://",
+                        "/api/java.base/module-summary.html\" class=\"external-link\"><code>java.base</code></a>",
+
+                        "package <a href=\"https://",
+                        "/api/java.base/java/util/package-summary.html\" class=\"external-link\"><code>java.util</code></a>",
+
+                        "class <a href=\"https://",
+                        "/api/java.base/java/lang/String.html\" title=\"class or interface in java.lang\" class=\"external-link\"><code>String</code></a>",
+
+                        "interface <a href=\"https://",
+                        "/api/java.base/java/lang/Runnable.html\" title=\"class or interface in java.lang\" class=\"external-link\"><code>Runnable</code></a>",
+
+                        "a field <a href=\"https://",
+                        "/api/java.base/java/lang/String.html#CASE_INSENSITIVE_ORDER\" title=\"class or interface in java.lang\" class=\"external-link\"><code>String.CASE_INSENSITIVE_ORDER</code></a>",
+
+                        "a constructor <a href=\"https://",
+                        "/api/java.base/java/lang/String.html#%3Cinit%3E()\" title=\"class or interface in java.lang\" class=\"external-link\"><code>String()</code></a></li>",
+
+                        "a method <a href=\"https://",
+                        "/api/java.base/java/lang/String.html#chars()\" title=\"class or interface in java.lang\" class=\"external-link\"><code>String.chars()</code></a>");
+    }
+
+    /// Test the ability to include array elements in method signatures for
+    /// automatic links to program elements.
+    @Test
+    public void testReferenceWithArrays(Path base) throws Exception {
+        Path src = base.resolve("src");
+
+        // in the following,
+        //
+        // * Link 0 is a simple control for a shortcut reference link (without any arrays)
+        // * Link 1a and Link 2a are negative controls, in that they are _not_ valid links
+        //   because of the unescaped [] pair
+        // * Link 1b and 2b are the positive tests, showing that the square brackets
+        //   need to be escaped in the source code, and that they are not escaped in
+        //   the generated HTML
+
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// First sentence.
+                    /// * Link 0 to [util.Arrays]
+                    /// * Link 1a to [Arrays-equals][util.Arrays#equals(Object[],Object[])]
+                    /// * Link 1b to [Arrays-equals][util.Arrays#equals(Object\\[\\],Object\\[\\])]
+                    /// * Link 2a to [util.Arrays#equals(Object[],Object[])]
+                    /// * Link 2b to [util.Arrays#equals(Object\\[\\],Object\\[\\])]
+                    public class C { }""",
+                // simulate java.util.Arrays.equals, to avoid links to platform references
+                """
+                    package util;
+                    public class Arrays {
+                        public boolean equals(Object[] a, Object[] a2);
+                    }""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p", "util");
+
+        checkExit(Exit.OK);
+        checkOutput("p/C.html", true,
+                """
+                    Link 0 to <a href="../util/Arrays.html" title="class in util"><code>Arrays</code></a>""",
+                """
+                    Link 1a to [Arrays-equals][util.Arrays#equals(Object[],Object[])]""",
+                """
+                    Link 1b to <a href="../util/Arrays.html#equals(java.lang.Object%5B%5D,\
+                    java.lang.Object%5B%5D)">Arrays-equals</a>""",
+                """
+                    Link 2a to [util.Arrays#equals(Object[],Object[])]""",
+                """
+                    Link 2b to <a href="../util/Arrays.html#equals(java.lang.Object%5B%5D,\
+                    java.lang.Object%5B%5D)"><code>Arrays.equals(Object[],Object[])</code></a>"""
+        );
+    }
+
+    @Test
+    public void testSee(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// First sentence.
+                    /// @see "A reference"
+                    /// @see <a href="http://www.example.com">Example</a>
+                    /// @see D a _Markdown_ description
+                    public class C { }
+                    """,
+                """
+                    package p;
+                    public class D { }""");
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    <dt>See Also:</dt>
+                    <dd>
+                    <ul class="tag-list">
+                    <li>"A reference"</li>
+                    <li><a href="http://www.example.com">Example</a></li>
+                    <li><a href="D.html" title="class in p">a <em>Markdown</em> description</a></li>
+                    </ul>
+                    </dd>""");
+
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownTaglets.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownTaglets.java
new file mode 100644
index 00000000000..fa9d3bbad12
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownTaglets.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.* DivTaglet SpanTaglet
+ * @run main TestMarkdownTaglets
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class TestMarkdownTaglets extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownTaglets();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    // The following test checks whether the output of system taglets
+    // is or is not wrapped in <p> tags, depending on the context within
+    // the doc comment and the output generated by the taglet.
+    //
+    // {@code ...} is used as an example of a tag that generates phrasing content.
+    // {@snippet ...} is used as an example of a tag that generates block content.
+    //
+    // See also: testUserTaglets
+    @Test
+    public void testSystemTaglets(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// First sentence.
+                        ///
+                        /// {@code this is code_standalone}
+                        ///
+                        /// Lorem ipsum.
+                        public void code_standalone() { }
+
+                        /// First sentence.
+                        ///
+                        /// Before.
+                        /// {@code this is code_wrapped}
+                        /// After.
+                        ///
+                        /// Lorem ipsum.
+                        public void code_wrapped() { }
+
+                        /// First sentence.
+                        ///
+                        /// {@snippet :
+                        ///    this is snippet_standalone
+                        /// }
+                        ///
+                        /// Lorem ipsum.
+                        public void snippet_standalone() { }
+
+                        /// First sentence.
+                        ///
+                        /// Before.
+                        /// {@snippet :
+                        ///    this is a snippet_wrapped
+                        /// }
+                        /// After.
+                        ///
+                        /// Lorem ipsum.
+                        public void snippet_wrapped() { }
+                    }""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <p><code>this is code_standalone</code></p>
+                    <p>Lorem ipsum.</p>
+                    </div>""",
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <p>Before.
+                    <code>this is code_wrapped</code>
+                    After.</p>
+                    <p>Lorem ipsum.</p>
+                    </div>""",
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" \
+                    onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span>\
+                    <img src="../resource-files/copy.svg" alt="Copy snippet"></button>
+                    <pre class="snippet"><code>   this is snippet_standalone
+                    </code></pre>
+                    </div>
+
+                    <p>Lorem ipsum.</p>
+                    </div>""",
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <p>Before.</p>
+                    <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span><img src="../resource-files/copy.svg" alt="Copy snippet"></button>
+                    <pre class="snippet"><code>   this is a snippet_wrapped
+                    </code></pre>
+                    </div>
+
+                    <p>After.</p>
+                    <p>Lorem ipsum.</p>
+                    </div>""");
+    }
+
+    // The following test checks whether the output of user-defined taglets
+    // is or is not wrapped in <p> tags, depending on the context within
+    // the doc comment and the output generated by the taglet.
+    //
+    // {@span ...} is used as an example of a taglet that generates phrasing content.
+    // {@div ...} is used as an example of a taglet that generates block content.
+    //
+    // See also: testSystemTaglets
+    @Test
+    public void testUserTaglets(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// First sentence.
+                        ///
+                        /// {@span this is phrasing_standalone}
+                        ///
+                        /// Lorem ipsum.
+                        public void phrasing_standalone() { }
+
+                        /// First sentence.
+                        ///
+                        /// Before.
+                        /// {@span this is phrasing_wrapped}
+                        /// After.
+                        ///
+                        /// Lorem ipsum.
+                        public void phrasing_wrapped() { }
+
+                        /// First sentence.
+                        ///
+                        /// {@div this is block_standalone}
+                        ///
+                        /// Lorem ipsum.
+                        public void block_standalone() { }
+
+                        /// First sentence.
+                        ///
+                        /// Before.
+                        /// {@div this is block_wrapped}
+                        /// After.
+                        ///
+                        /// Lorem ipsum.
+                        public void block_wrapped() { }
+                    }""");
+
+        String testClasses = System.getProperty("test.classes");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-tagletpath", testClasses,
+                "-taglet", "DivTaglet",
+                "-taglet", "SpanTaglet",
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true, """
+                    <div class="block"><p>First sentence.</p>
+                    <p><span>this is phrasing_standalone</span></p>
+                    <p>Lorem ipsum.</p>
+                    </div>""",
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <p>Before.
+                    <span>this is phrasing_wrapped</span>
+                    After.</p>
+                    <p>Lorem ipsum.</p>
+                    </div>""",
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <div>this is block_standalone</div>
+                    <p>Lorem ipsum.</p>
+                    </div>""",
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <p>Before.</p>
+                    <div>this is block_wrapped</div>
+                    <p>After.</p>
+                    <p>Lorem ipsum.</p>
+                    </div>""");
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java b/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java
index 0a72e7dff89..f188aa036f4 100644
--- a/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java
+++ b/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java
@@ -29,15 +29,17 @@
  *          jdk.javadoc/jdk.javadoc.internal.doclets.formats.html.resources:open
  *          jdk.javadoc/jdk.javadoc.internal.doclets.toolkit.resources:open
  *          jdk.javadoc/jdk.javadoc.internal.tool.resources:open
- *          jdk.jdeps/com.sun.tools.classfile
+ * @enablePreview
  */
 
 import java.io.*;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.constantpool.Utf8Entry;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.tools.*;
-import com.sun.tools.classfile.*;
 
 /**
  * Compare string constants in javadoc classes against keys in javadoc resource bundles.
@@ -268,15 +270,15 @@ void scan(JavaFileObject fo, Set<String> results) throws IOException {
         //System.err.println("scan " + fo.getName());
         InputStream in = fo.openInputStream();
         try {
-            ClassFile cf = ClassFile.read(in);
-            for (ConstantPool.CPInfo cpinfo: cf.constant_pool.entries()) {
-                if (cpinfo.getTag() == ConstantPool.CONSTANT_Utf8) {
-                    String v = ((ConstantPool.CONSTANT_Utf8_info) cpinfo).value;
+            ClassModel cf = ClassFile.of().parse(in.readAllBytes());
+            for (var cpinfo : cf.constantPool()) {
+                if (cpinfo instanceof Utf8Entry utf8Entry) {
+                    String v = utf8Entry.stringValue();
                     if (v.matches("(doclet|main|javadoc|tag)\\.[A-Za-z0-9-_.]+"))
                         results.add(v);
                 }
             }
-        } catch (ConstantPoolException ignore) {
+        } catch (IllegalArgumentException ignore) {
         } finally {
             in.close();
         }
diff --git a/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/util/PoorDocCommentTable.java b/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/util/PoorDocCommentTable.java
index 441f9bd2251..1fbfcc403b7 100644
--- a/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/util/PoorDocCommentTable.java
+++ b/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/util/PoorDocCommentTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 import java.util.HashMap;
 
+import javax.lang.model.util.Elements.DocCommentKind;
+
 import com.sun.tools.javac.parser.Tokens.Comment;
 import com.sun.tools.javac.tree.DCTree.DCDocComment;
 import com.sun.tools.javac.tree.DocCommentTable;
@@ -52,6 +54,15 @@ public Comment getComment(JCTree tree) {
         return table.get(tree);
     }
 
+    public DocCommentKind getCommentKind(JCTree tree) {
+        Comment c = getComment(tree);
+        return c == null ? null : switch (c.getStyle()) {
+            case JAVADOC_BLOCK -> DocCommentKind.TRADITIONAL;
+            case JAVADOC_LINE -> DocCommentKind.END_OF_LINE;
+            default -> throw new IllegalStateException(c.getStyle().toString());
+        };
+    }
+
     public String getCommentText(JCTree tree) {
         Comment c = getComment(tree);
         return (c == null) ? null : c.getText();
diff --git a/test/langtools/jdk/javadoc/tool/testLineCommentOption/TestLineCommentOption.java b/test/langtools/jdk/javadoc/tool/testLineCommentOption/TestLineCommentOption.java
new file mode 100644
index 00000000000..f3b2ef0502f
--- /dev/null
+++ b/test/langtools/jdk/javadoc/tool/testLineCommentOption/TestLineCommentOption.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestLineCommentOption
+ */
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.ServiceLoader;
+import java.util.stream.StreamSupport;
+
+import com.sun.source.doctree.DocCommentTree;
+import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.RawTextTree;
+import com.sun.source.doctree.TextTree;
+import com.sun.source.util.DocTreeFactory;
+import com.sun.source.util.DocTrees;
+
+import com.sun.tools.javac.api.JavacTrees;
+
+import javadoc.tester.JavadocTester;
+import jdk.javadoc.doclet.DocletEnvironment;
+import jdk.javadoc.doclet.StandardDoclet;
+import toolbox.ToolBox;
+
+public class TestLineCommentOption extends JavadocTester {
+    public static void main(String... args) throws Exception {
+        var tester = new TestLineCommentOption();
+        tester.runTests();
+    }
+
+    private final ToolBox tb = new ToolBox();
+
+
+    // This is a somewhat worthless test case, given all the test cases for
+    // Markdown content in line comments.
+    @Test
+    public void testNoOption(Path base) throws Exception {
+        // use a dummy option
+        // note that we cannot use -Xlint:dangling-doc-comments in javadoc
+        test(base, "-XDdummy", "Line comment");
+        // in the future, check for diagnostic output about a dangling comment
+    }
+
+    @Test
+    public void testOption(Path base) throws Exception {
+        test(base, "--disable-line-doc-comments", "Traditional comment");
+    }
+
+    void test(Path base, String option, String expect) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, """
+            package p;
+            /**
+             * Traditional comment.
+             */
+            /// Line comment
+            public class C {
+                private C() { }
+            }""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "--source-path", src.toString(),
+                option,
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput("p/C.html", true,
+                expect);
+    }
+}
diff --git a/test/langtools/jdk/javadoc/tool/testTransformer/TestTransformer.java b/test/langtools/jdk/javadoc/tool/testTransformer/TestTransformer.java
new file mode 100644
index 00000000000..c3942e34f13
--- /dev/null
+++ b/test/langtools/jdk/javadoc/tool/testTransformer/TestTransformer.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestTransformer
+ */
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.ServiceLoader;
+import java.util.stream.StreamSupport;
+
+import com.sun.source.doctree.DocCommentTree;
+import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.RawTextTree;
+import com.sun.source.doctree.TextTree;
+import com.sun.source.util.DocTreeFactory;
+import com.sun.source.util.DocTrees;
+
+import com.sun.tools.javac.api.JavacTrees;
+
+import javadoc.tester.JavadocTester;
+import jdk.javadoc.doclet.DocletEnvironment;
+import jdk.javadoc.doclet.StandardDoclet;
+import toolbox.ToolBox;
+
+public class TestTransformer extends JavadocTester {
+    public static void main(String... args) throws Exception {
+        var tester = new TestTransformer();
+        tester.runTests();
+    }
+
+    private final ToolBox tb = new ToolBox();
+
+    @Test
+    public void testFindStandardTransformer_raw() {
+        int count = 0;
+        var sl = ServiceLoader.load(JavacTrees.DocCommentTreeTransformer.class);
+        for (var t : sl) {
+            if (t.name().equals("standard")) {
+                out.println("Found " + t);
+                count++;
+            }
+        }
+        checking("transformer");
+        if (count == 1) {
+            passed("expected transformer found");
+        } else {
+            failed("expected transformer not found");
+        }
+    }
+
+    @Test
+    public void testFindStandardTransformer_stream() {
+        var dct = getTransformer("standard");
+        checking("transformer");
+        if (dct.isPresent()) {
+            out.println("Found " + dct.get());
+            passed("expected transformer found");
+        } else {
+            failed("transformer not found");
+        }
+    }
+
+    private Optional<JavacTrees.DocCommentTreeTransformer> getTransformer(String name) {
+        var sl = ServiceLoader.load(JavacTrees.DocCommentTreeTransformer.class);
+        return sl.stream()
+                .map(ServiceLoader.Provider::get)
+                .filter(t -> t.name().equals(name))
+                .findFirst();
+    }
+
+    public static class MyTransformer implements JavacTrees.DocCommentTreeTransformer {
+
+        private DocTreeFactory m;
+        @Override
+        public String name() {
+            return getClass().getSimpleName();
+        }
+
+        @Override
+        public DocCommentTree transform(DocTrees trees, DocCommentTree tree) {
+            m = trees.getDocTreeFactory();
+            return m.newDocCommentTree(transform(tree.getFullBody()), tree.getBlockTags());
+        }
+
+        private List<? extends DocTree> transform(List<? extends DocTree> list) {
+            return list.stream().map(this::transform).toList();
+        }
+
+        private DocTree transform(DocTree tree) {
+            return switch (tree) {
+                case TextTree tt ->
+                        m.newTextTree(transform(tt.getBody()));
+                case RawTextTree rtt ->
+                        m.newRawTextTree(rtt.getKind(), transform(rtt.getContent()));
+                default ->
+                        tree;
+            };
+        }
+
+        private String transform(String s) {
+            return s.replace("lowercase", "UPPERCASE");
+        }
+    }
+
+    public static class MyDoclet extends StandardDoclet {
+        @Override
+        public boolean run(DocletEnvironment docEnv) {
+            ((JavacTrees) docEnv.getDocTrees()).setDocCommentTreeTransformer(new MyTransformer());
+            return super.run(docEnv);
+        }
+    }
+
+    @Test
+    public void testMyTransformer(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, """
+                package p;
+                /**
+                 * This traditional comment contains a lowercase word.
+                 */
+                public class Trad { }
+                """, """
+                package p;
+                /// This line comment contains a lowercase word.
+                public class Line { }
+                """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "-XDaccessInternalAPI", // required to access JavacTrees
+                "-doclet", "TestTransformer$MyDoclet",
+                "-docletpath", System.getProperty("test.classes"),
+                "-sourcepath", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput("p/Line.html", true, """
+                <div class="block">This line comment contains a UPPERCASE word.</div>""");
+        checkOutput("p/Trad.html", true, """
+                <div class="block">This traditional comment contains a UPPERCASE word.</div>""");
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/jdk/jshell/ImportTest.java b/test/langtools/jdk/jshell/ImportTest.java
index b8f3f1ee5d0..0e1dbfead96 100644
--- a/test/langtools/jdk/jshell/ImportTest.java
+++ b/test/langtools/jdk/jshell/ImportTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8141415
+ * @bug 8141415 8129418
  * @summary Test imports
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
@@ -80,12 +80,11 @@ public void testImportStaticOnDemand() {
         assertEval("abs(cos(PI / 2)) < 0.00001;", "true");
     }
 
-    @Test(enabled = false) // TODO 8129418
     public void testUnknownPackage() {
         assertDeclareFail("import unknown.qqq;",
                 new ExpectedDiagnostic("compiler.err.doesnt.exist", 7, 18, 14, -1, -1, Diagnostic.Kind.ERROR));
         assertDeclareFail("import unknown.*;",
-                new ExpectedDiagnostic("compiler.err.doesnt.exist", 7, 15, 7, -1, -1, Diagnostic.Kind.ERROR));
+                new ExpectedDiagnostic("compiler.err.doesnt.exist", 7, 14, 7, -1, -1, Diagnostic.Kind.ERROR));
     }
 
     public void testBogusImportIgnoredInFuture() {
diff --git a/test/langtools/tools/javac/7129225/NegTest.out b/test/langtools/tools/javac/7129225/NegTest.out
index d6fbd22adc3..53ceaa4cb9a 100644
--- a/test/langtools/tools/javac/7129225/NegTest.out
+++ b/test/langtools/tools/javac/7129225/NegTest.out
@@ -1,2 +1,2 @@
-TestImportStar.java:16:1: compiler.err.doesnt.exist: xxx
+TestImportStar.java:16:8: compiler.err.doesnt.exist: xxx
 1 error
diff --git a/test/langtools/tools/javac/7129225/TestImportStar.out b/test/langtools/tools/javac/7129225/TestImportStar.out
index 86ff8933138..352c0848392 100644
--- a/test/langtools/tools/javac/7129225/TestImportStar.out
+++ b/test/langtools/tools/javac/7129225/TestImportStar.out
@@ -1,4 +1,4 @@
 - compiler.note.proc.messager: RUNNING - lastRound = false
-TestImportStar.java:16:1: compiler.err.doesnt.exist: xxx
+TestImportStar.java:16:8: compiler.err.doesnt.exist: xxx
 - compiler.note.proc.messager: RUNNING - lastRound = true
 1 error
diff --git a/test/langtools/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java b/test/langtools/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java
index e81db00e5df..734b1741682 100644
--- a/test/langtools/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java
+++ b/test/langtools/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,60 +25,66 @@
  * @test
  * @bug 7166455
  * @summary javac doesn't set ACC_STRICT bit on <clinit> for strictfp class
- * @modules jdk.jdeps/com.sun.tools.classfile
- * @compile -source 16 -target 16 CheckACC_STRICTFlagOnclinitTest.java
- * @run main CheckACC_STRICTFlagOnclinitTest
+ * @library /tools/lib /test/lib
+ * @enablePreview
  */
 
+import jdk.test.lib.compiler.CompilerUtils;
+import toolbox.ToolBox;
+
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.MethodModel;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import java.io.File;
 import java.io.IOException;
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.Descriptor;
-import com.sun.tools.classfile.Descriptor.InvalidDescriptor;
-import com.sun.tools.classfile.Method;
-
-import static com.sun.tools.classfile.AccessFlags.ACC_STRICT;
 
-public strictfp class CheckACC_STRICTFlagOnclinitTest {
+public class CheckACC_STRICTFlagOnclinitTest {
     private static final String AssertionErrorMessage =
         "All methods should have the ACC_STRICT access flag " +
         "please check output";
     private static final String offendingMethodErrorMessage =
         "Method %s of class %s doesn't have the ACC_STRICT access flag";
 
-    static {
-        class Foo {
-            class Bar {
-                void m11() {}
+    private static final String SOURCE = """
+            public strictfp class Test {
+                static {
+                    class Foo {
+                        class Bar {
+                            void m11() {}
+                        }
+                        void m1() {}
+                    }
+                }
+                void m2() {
+                    class Any {
+                        void m21() {}
+                    }
+                }
             }
-            void m1() {}
-        }
-    }
-    void m2() {
-        class Any {
-            void m21() {}
-        }
-    }
+            """;
 
-    private List<String> errors = new ArrayList<>();
+    private final List<String> errors = new ArrayList<>();
 
     public static void main(String[] args)
-            throws IOException, ConstantPoolException, InvalidDescriptor {
+            throws IOException {
         new CheckACC_STRICTFlagOnclinitTest().run();
     }
 
     private void run()
-            throws IOException, ConstantPoolException, InvalidDescriptor {
-        String testClasses = System.getProperty("test.classes");
-        check(testClasses,
-              "CheckACC_STRICTFlagOnclinitTest.class",
-              "CheckACC_STRICTFlagOnclinitTest$1Foo.class",
-              "CheckACC_STRICTFlagOnclinitTest$1Foo$Bar.class",
-              "CheckACC_STRICTFlagOnclinitTest$1Any.class");
-        if (errors.size() > 0) {
+            throws IOException {
+        Path in = Path.of("in");
+        Path out = Path.of("out");
+        ToolBox toolBox = new ToolBox();
+        toolBox.writeJavaFiles(in, SOURCE);
+        CompilerUtils.compile(in, out, "--release", "16");
+        check(out,
+              "Test.class",
+              "Test$1Foo.class",
+              "Test$1Foo$Bar.class",
+              "Test$1Any.class");
+        if (!errors.isEmpty()) {
             for (String error: errors) {
                 System.err.println(error);
             }
@@ -86,37 +92,17 @@ private void run()
         }
     }
 
-    void check(String dir, String... fileNames)
-        throws
-            IOException,
-            ConstantPoolException,
-            Descriptor.InvalidDescriptor {
+    void check(Path dir, String... fileNames) throws IOException {
         for (String fileName : fileNames) {
-            ClassFile classFileToCheck = ClassFile.read(new File(dir, fileName));
+            ClassModel classFileToCheck = ClassFile.of().parse(dir.resolve(fileName));
 
-            for (Method method : classFileToCheck.methods) {
-                if ((method.access_flags.flags & ACC_STRICT) == 0) {
+            for (MethodModel method : classFileToCheck.methods()) {
+                if ((method.flags().flagsMask() & ClassFile.ACC_STRICT) == 0) {
                     errors.add(String.format(offendingMethodErrorMessage,
-                            method.getName(classFileToCheck.constant_pool),
-                            classFileToCheck.getName()));
+                            method.methodName().stringValue(),
+                            classFileToCheck.thisClass().asInternalName()));
                 }
             }
         }
     }
-
-// this version of the code can be used when ClassFile API in not in a preview
-//    void check(String dir, String... fileNames) throws IOException{
-//        for (String fileName : fileNames) {
-//            ClassModel classFileToCheck = ClassFile.of().parse(new File(dir, fileName).toPath());
-//
-//            for (MethodModel method : classFileToCheck.methods()) {
-//                if ((method.flags().flagsMask() & ClassFile.ACC_STRICT) == 0) {
-//                    errors.add(String.format(offendingMethodErrorMessage,
-//                            method.methodName().stringValue(),
-//                            classFileToCheck.thisClass().asInternalName()));
-//                }
-//            }
-//        }
-//    }
-
 }
diff --git a/test/langtools/tools/javac/StringConcat/TestIndyStringConcat.java b/test/langtools/tools/javac/StringConcat/TestIndyStringConcat.java
index 39b9cd52998..72576a7fcb8 100644
--- a/test/langtools/tools/javac/StringConcat/TestIndyStringConcat.java
+++ b/test/langtools/tools/javac/StringConcat/TestIndyStringConcat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,76 +21,78 @@
  * questions.
  */
 
-import com.sun.tools.classfile.*;
-import com.sun.tools.classfile.BootstrapMethods_attribute.BootstrapMethodSpecifier;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_InvokeDynamic_info;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_MethodHandle_info;
+import jdk.test.lib.compiler.CompilerUtils;
+import toolbox.ToolBox;
 
-import java.io.File;
+import java.lang.classfile.Attributes;
+import java.lang.classfile.BootstrapMethodEntry;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.CodeElement;
+import java.lang.classfile.MethodModel;
+import java.lang.classfile.attribute.CodeAttribute;
+import java.lang.classfile.constantpool.MethodHandleEntry;
+import java.lang.classfile.instruction.InvokeDynamicInstruction;
+import java.nio.file.Path;
 
 /*
  * @test
  * @bug     8148483 8151516 8151223
  * @summary Test that StringConcat is working for JDK >= 9
- * @modules jdk.jdeps/com.sun.tools.classfile
- *
- * @clean *
- * @compile -source 8 -target 8 TestIndyStringConcat.java
- * @run main TestIndyStringConcat false
- *
- * @clean *
- * @compile -XDstringConcat=inline TestIndyStringConcat.java
- * @run main TestIndyStringConcat false
- *
- * @clean *
- * @compile -XDstringConcat=indy TestIndyStringConcat.java
- * @run main TestIndyStringConcat true
- *
- * @clean *
- * @compile -XDstringConcat=indyWithConstants TestIndyStringConcat.java
- * @run main TestIndyStringConcat true
+ * @library /tools/lib /test/lib
+ * @enablePreview
+ * @run main TestIndyStringConcat
  */
 public class TestIndyStringConcat {
 
-    static String other;
+    private static final String SOURCE = """
+            public class IndyStringConcat {
+                static String other;
 
-    public static String test() {
-        return "Foo" + other;
-    }
+                public static String test() {
+                    return "Foo" + other;
+                }
+            }
+            """;
 
     public static void main(String[] args) throws Exception {
-        boolean expected = Boolean.valueOf(args[0]);
-        boolean actual = hasStringConcatFactoryCall("test");
-        if (expected != actual) {
-            throw new AssertionError("expected = " + expected + ", actual = " + actual);
-        }
-    }
-
-    public static boolean hasStringConcatFactoryCall(String methodName) throws Exception {
-        ClassFile classFile = ClassFile.read(new File(System.getProperty("test.classes", "."),
-                TestIndyStringConcat.class.getName() + ".class"));
-        ConstantPool constantPool = classFile.constant_pool;
+        Path src = Path.of("src");
+        ToolBox toolBox = new ToolBox();
+        toolBox.writeJavaFiles(src, SOURCE);
 
-        BootstrapMethods_attribute bsm_attr =
-                (BootstrapMethods_attribute)classFile
-                        .getAttribute(Attribute.BootstrapMethods);
+        int errors = 0;
+        errors += test(false, "java8", "-source", "8", "-target", "8");
+        errors += test(false, "inline", "-XDstringConcat=inline");
+        errors += test(true, "indy", "-XDstringConcat=indy");
+        errors += test(true, "indyWithConstants", "-XDstringConcat=indyWithConstants");
 
-        for (Method method : classFile.methods) {
-            if (method.getName(constantPool).equals(methodName)) {
-                Code_attribute code = (Code_attribute) method.attributes
-                        .get(Attribute.Code);
-                for (Instruction i : code.getInstructions()) {
-                    if (i.getOpcode() == Opcode.INVOKEDYNAMIC) {
-                        CONSTANT_InvokeDynamic_info indyInfo =
-                                (CONSTANT_InvokeDynamic_info) constantPool.get(i.getUnsignedShort(1));
+        if (errors > 0) {
+            throw new AssertionError(errors + " cases failed");
+        }
+    }
 
-                        BootstrapMethodSpecifier bsmSpec =
-                                bsm_attr.bootstrap_method_specifiers[indyInfo.bootstrap_method_attr_index];
+    public static int test(boolean expected, String label, String... args) throws Exception {
+        Path src = Path.of("src");
+        Path out = Path.of(label);
+        CompilerUtils.compile(src, out, args);
+        if (hasStringConcatFactoryCall(out.resolve("IndyStringConcat.class"), "test") != expected) {
+            System.err.println("Expected " + expected + " failed for case " + label);
+            return 1;
+        }
+        return 0;
+    }
 
-                        CONSTANT_MethodHandle_info bsmInfo =
-                                (CONSTANT_MethodHandle_info) constantPool.get(bsmSpec.bootstrap_method_ref);
+    public static boolean hasStringConcatFactoryCall(Path file, String methodName) throws Exception {
+        ClassModel classFile = ClassFile.of().parse(file);
 
-                        if (bsmInfo.getCPRefInfo().getClassName().equals("java/lang/invoke/StringConcatFactory")) {
+        for (MethodModel method : classFile.methods()) {
+            if (method.methodName().equalsString(methodName)) {
+                CodeAttribute code = method.findAttribute(Attributes.CODE).orElseThrow();
+                for (CodeElement i : code.elementList()) {
+                    if (i instanceof InvokeDynamicInstruction indy) {
+                        BootstrapMethodEntry bsmSpec = indy.invokedynamic().bootstrap();
+                        MethodHandleEntry bsmInfo = bsmSpec.bootstrapMethod();
+                        if (bsmInfo.reference().owner().asInternalName().equals("java/lang/invoke/StringConcatFactory")) {
                             return true;
                         }
                     }
@@ -100,27 +102,4 @@ public static boolean hasStringConcatFactoryCall(String methodName) throws Excep
         return false;
     }
 
-// this version of the code can be used when ClassFile API in not in a preview
-//    public static boolean hasStringConcatFactoryCall(String methodName) throws Exception {
-//        ClassModel classFile = ClassFile.of().parse(new File(System.getProperty("test.classes", "."),
-//                TestIndyStringConcat.class.getName() + ".class").toPath());
-//
-//        for (MethodModel method : classFile.methods()) {
-//            if (method.methodName().equalsString(methodName)) {
-//                CodeAttribute code = method.findAttribute(Attributes.CODE).orElseThrow();
-//                for (CodeElement i : code.elementList()) {
-//                    if (i instanceof InvokeDynamicInstruction) {
-//                        InvokeDynamicInstruction indy = (InvokeDynamicInstruction) i;
-//                        BootstrapMethodEntry bsmSpec = indy.invokedynamic().bootstrap();
-//                        MethodHandleEntry bsmInfo = bsmSpec.bootstrapMethod();
-//                        if (bsmInfo.reference().owner().asInternalName().equals("java/lang/invoke/StringConcatFactory")) {
-//                            return true;
-//                        }
-//                    }
-//                }
-//            }
-//        }
-//        return false;
-//    }
-
 }
diff --git a/test/langtools/tools/javac/classfiles/attributes/SourceFile/SourceFileTestBase_legacy.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/SourceFileTestBase_legacy.java
deleted file mode 100644
index b8fdcff4e88..00000000000
--- a/test/langtools/tools/javac/classfiles/attributes/SourceFile/SourceFileTestBase_legacy.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import com.sun.tools.classfile.Attribute;
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.SourceFile_attribute;
-
-import java.io.InputStream;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.tools.JavaFileObject;
-
-import toolbox.ToolBox;
-
-/**
- * Base class for Source file attribute tests. Checks expected file name for specified classes in the SourceFile attribute.
- * To add new tests you should extend the SourceFileTestBase class and invoke {@link #test} for static sources
- * or {@link #compileAndTest} for generated sources. For more information see corresponding methods.
- *
- * @see #test
- * @see #compileAndTest
- */
-public class SourceFileTestBase_legacy extends TestBase {
-    /**
-     * Checks expected fileName for the specified class in the SourceFile attribute.
-     *
-     * @param classToTest class to check its SourceFile attribute
-     * @param fileName    expected name of the file from which the test file is compiled.
-     */
-    protected void test(Class<?> classToTest, String fileName) throws Exception {
-        assertAttributePresent(ClassFile.read(getClassFile(classToTest)), fileName);
-    }
-
-    /**
-     * Checks expected fileName for the specified class in the SourceFile attribute.
-     *
-     * @param classToTest class name to check its SourceFile attribute
-     * @param fileName    expected name of the file from which the test file is compiled.
-     */
-    protected void test(String classToTest, String fileName) throws Exception {
-        assertAttributePresent(ClassFile.read(getClassFile(classToTest + ".class")), fileName);
-    }
-
-    /**
-     * Checks expected fileName for the specified class in the SourceFile attribute.
-     *
-     * @param classToTest path of class to check its SourceFile attribute
-     * @param fileName    expected name of the file from which the test file is compiled.
-     */
-    protected void test(Path classToTest, String fileName) throws Exception {
-        assertAttributePresent(ClassFile.read(classToTest), fileName);
-    }
-
-    /**
-     * Compiles sourceCode and for each specified class name checks the SourceFile attribute.
-     * The file name is extracted from source code.
-     *
-     * @param sourceCode    source code to compile
-     * @param classesToTest class names to check their SourceFile attribute.
-     */
-    protected void compileAndTest(String sourceCode, String... classesToTest) throws Exception {
-
-        Map<String, ? extends JavaFileObject> classes = compile(sourceCode).getClasses();
-        String fileName = ToolBox.getJavaFileNameFromSource(sourceCode);
-        for (String className : classesToTest) {
-            ClassFile classFile;
-            try (InputStream input = classes.get(className).openInputStream()) {
-                classFile = ClassFile.read(input);
-            }
-            assertAttributePresent(classFile, fileName);
-        }
-    }
-
-    private void assertAttributePresent(ClassFile classFile, String fileName) throws Exception {
-
-        //We need to count attributes with the same names because there is no appropriate API in the ClassFile.
-
-        List<SourceFile_attribute> sourceFileAttributes = new ArrayList<>();
-        for (Attribute a : classFile.attributes.attrs) {
-            if (Attribute.SourceFile.equals(a.getName(classFile.constant_pool))) {
-                sourceFileAttributes.add((SourceFile_attribute) a);
-            }
-        }
-
-        assertEquals(sourceFileAttributes.size(), 1, "Should be the only SourceFile attribute");
-
-        SourceFile_attribute attribute = sourceFileAttributes.get(0);
-
-        assertEquals(classFile.constant_pool.getUTF8Info(attribute.attribute_name_index).value,
-                Attribute.SourceFile, "Incorrect attribute name");
-        assertEquals(classFile.constant_pool.getUTF8Info(attribute.sourcefile_index).value, fileName,
-                "Incorrect source file name");
-        assertEquals(attribute.attribute_length, 2, "Incorrect attribute length");
-    }
-}
diff --git a/test/langtools/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java
index 92a6e6b9bae..33f55545d81 100644
--- a/test/langtools/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,27 +25,49 @@
  * @test
  * @summary sourcefile attribute test for synthetic class.
  * @bug 8040129
- * @library /tools/lib /tools/javac/lib ../lib_legacy
+ * @library /tools/lib /tools/javac/lib /test/lib ../lib
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.jdeps/com.sun.tools.classfile
- * @build toolbox.ToolBox InMemoryFileManager TestBase SourceFileTestBase_legacy
- * @compile -source 10 -target 10 SyntheticClassTest.java
- * @run main SyntheticClassTest true
- * @clean SyntheticClassTest$1
- * @compile SyntheticClassTest.java
- * @run main SyntheticClassTest false
+ *          java.base/jdk.internal.classfile.impl
+ * @build toolbox.ToolBox InMemoryFileManager TestBase SourceFileTestBase
+ * @enablePreview
+ * @run main SyntheticClassTest
  */
 
+import jdk.test.lib.compiler.CompilerUtils;
+import toolbox.ToolBox;
+
 import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
 
-public class SyntheticClassTest extends SourceFileTestBase_legacy {
+public class SyntheticClassTest extends SourceFileTestBase {
     public static void main(String[] args) throws Exception {
-        boolean expectSynthetic = Boolean.parseBoolean(args[0]);
-        new Inner();
+        String sourceCode = """
+                public class SyntheticClass {
+                    static class Inner {
+                        private Inner() {
+                        }
+                    }
+
+                    public SyntheticClass() {
+                        new Inner();
+                    }
+                }
+                """;
+        Path srcDir = Path.of("src");
+        Path v10Dir = Path.of("out10");
+        Path modernDir = Path.of("out");
+        ToolBox toolBox = new ToolBox();
+        toolBox.writeJavaFiles(srcDir, sourceCode);
+        CompilerUtils.compile(srcDir, v10Dir, "--release", "10");
+        CompilerUtils.compile(srcDir, modernDir);
+        test(v10Dir, true);
+        test(modernDir, false);
+    }
 
+    private static void test(Path path, boolean expectSynthetic) throws Exception {
         try {
-            new SyntheticClassTest().test("SyntheticClassTest$1", "SyntheticClassTest.java");
+            new SyntheticClassTest().test(path.resolve("SyntheticClass$1.class"), "SyntheticClass.java");
             if (!expectSynthetic) {
                 throw new AssertionError("Synthetic class should not have been emitted!");
             }
@@ -55,9 +77,4 @@ public static void main(String[] args) throws Exception {
             }
         }
     }
-
-    static class Inner {
-        private Inner() {
-        }
-    }
 }
diff --git a/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTargetRelease14Test.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTargetRelease14Test.java
index 76d5d3c178d..e4dfb5000f5 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTargetRelease14Test.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTargetRelease14Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,12 +29,14 @@
  *          compiling with --release 14.
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.jdeps/com.sun.tools.classfile
- * @library /tools/lib /tools/javac/lib ../lib_legacy
- * @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
- * @build SyntheticTestDriver_legacy ExpectedClass ExpectedClasses
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build toolbox.ToolBox InMemoryFileManager
+ *        ExpectedClass ExpectedClasses
+ * @compile --enable-preview --source ${jdk.version} --target ${jdk.version}
+ *          SyntheticTestDriver.java
+ *          ../lib/TestResult.java ../lib/TestBase.java
  * @compile --source 14 -target 14 -XDdeduplicateLambdas=false BridgeMethodsForLambdaTargetRelease14Test.java
- * @run main SyntheticTestDriver_legacy BridgeMethodsForLambdaTargetRelease14Test
+ * @run main/othervm --enable-preview SyntheticTestDriver BridgeMethodsForLambdaTargetRelease14Test
  */
 
 import java.util.Comparator;
diff --git a/test/langtools/tools/javac/classfiles/attributes/Synthetic/SyntheticTestDriver_legacy.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/SyntheticTestDriver_legacy.java
deleted file mode 100644
index c9e333b0d4e..00000000000
--- a/test/langtools/tools/javac/classfiles/attributes/Synthetic/SyntheticTestDriver_legacy.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.regex.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import com.sun.tools.classfile.*;
-
-/**
- * The tests work as follows. Firstly, it looks through the test cases
- * and extracts the appropriate compiled classes. Each test case contains
- * a set of expected classes, methods and fields. Those class members must not have
- * the Synthetic attribute, while other found classes, methods and fields must have
- * the Synthetic attribute if they are not in the set of expected class members.
- *
- * Each test executes SyntheticTestDriver specifying the name of test cases and
- * the number of expected synthetic classes. Each test class is annotated by
- * annotations which contains non-synthetic class members.
- *
- * See the appropriate class for more information about a test case.
- */
-public class SyntheticTestDriver_legacy extends TestResult {
-
-    private static final String ACC_SYNTHETIC = "ACC_SYNTHETIC";
-
-    private final String testCaseName;
-    private final Map<String, ClassFile> classes;
-    private final Map<String, ExpectedClass> expectedClasses;
-
-    public static void main(String[] args)
-            throws TestFailedException, ConstantPoolException, IOException, ClassNotFoundException {
-        if (args.length != 1 && args.length != 2) {
-            throw new IllegalArgumentException("Usage: SyntheticTestDriver <class-name> [<number-of-synthetic-classes>]");
-        }
-        int numberOfSyntheticClasses = args.length == 1 ? 0 : Integer.parseInt(args[1]);
-        new SyntheticTestDriver_legacy(args[0]).test(numberOfSyntheticClasses);
-    }
-
-    public SyntheticTestDriver_legacy(String testCaseName) throws IOException, ConstantPoolException, ClassNotFoundException {
-        Class<?> clazz = Class.forName(testCaseName);
-        this.testCaseName = testCaseName;
-        this.expectedClasses = Stream.of(clazz.getAnnotationsByType(ExpectedClass.class))
-                .collect(Collectors.toMap(ExpectedClass::className, Function.identity()));
-        this.classes = new HashMap<>();
-        Path classDir = getClassDir().toPath();
-        Pattern filePattern = Pattern.compile(Pattern.quote(testCaseName.replace('.', File.separatorChar)) + ".*\\.class");
-        List<Path> paths = Files.walk(classDir)
-                .map(p -> classDir.relativize(p.toAbsolutePath()))
-                .filter(p -> filePattern.matcher(p.toString()).matches())
-                .collect(Collectors.toList());
-        for (Path path : paths) {
-            String className = path.toString().replace(".class", "").replace(File.separatorChar, '.');
-            classes.put(className, readClassFile(classDir.resolve(path).toFile()));
-        }
-        if (classes.isEmpty()) {
-            throw new RuntimeException("Classes have not been found.");
-        }
-        boolean success = classes.entrySet().stream()
-                .allMatch(e -> e.getKey().startsWith(testCaseName));
-        if (!success) {
-            classes.forEach((className, $) -> printf("Found class: %s\n", className));
-            throw new RuntimeException("Found classes are not from the test case : " + testCaseName);
-        }
-    }
-
-    private String getMethodName(ClassFile classFile, Method method)
-            throws ConstantPoolException, Descriptor.InvalidDescriptor {
-        String methodName = method.getName(classFile.constant_pool);
-        String parameters = method.descriptor.getParameterTypes(classFile.constant_pool);
-        return methodName + parameters;
-    }
-
-    public void test(int expectedNumberOfSyntheticClasses) throws TestFailedException {
-        try {
-            addTestCase(testCaseName);
-            Set<String> foundClasses = new HashSet<>();
-
-            int numberOfSyntheticClasses = 0;
-            for (Map.Entry<String, ClassFile> entry : classes.entrySet()) {
-                String className = entry.getKey();
-                ClassFile classFile = entry.getValue();
-                foundClasses.add(className);
-                if (testAttribute(
-                        classFile,
-                        () -> (Synthetic_attribute) classFile.getAttribute(Attribute.Synthetic),
-                        classFile.access_flags::getClassFlags,
-                        expectedClasses.keySet(),
-                        className,
-                        "Testing class " + className)) {
-                    ++numberOfSyntheticClasses;
-                }
-                ExpectedClass expectedClass = expectedClasses.get(className);
-                Set<String> expectedMethods = expectedClass != null
-                        ? toSet(expectedClass.expectedMethods())
-                        : new HashSet<>();
-                int numberOfSyntheticMethods = 0;
-                Set<String> foundMethods = new HashSet<>();
-                for (Method method : classFile.methods) {
-                    String methodName = getMethodName(classFile, method);
-                    foundMethods.add(methodName);
-                    if (testAttribute(
-                            classFile,
-                            () -> (Synthetic_attribute) method.attributes.get(Attribute.Synthetic),
-                            method.access_flags::getMethodFlags,
-                            expectedMethods,
-                            methodName,
-                            "Testing method " + methodName + " in class "
-                                    + className)) {
-                        ++numberOfSyntheticMethods;
-                    }
-                }
-                checkContains(foundMethods, expectedMethods,
-                        "Checking that all methods of class " + className
-                                + " without Synthetic attribute have been found");
-                checkEquals(numberOfSyntheticMethods,
-                        expectedClass == null ? 0 : expectedClass.expectedNumberOfSyntheticMethods(),
-                        "Checking number of synthetic methods in class: " + className);
-
-                Set<String> expectedFields = expectedClass != null
-                        ? toSet(expectedClass.expectedFields())
-                        : new HashSet<>();
-                int numberOfSyntheticFields = 0;
-                Set<String> foundFields = new HashSet<>();
-                for (Field field : classFile.fields) {
-                    String fieldName = field.getName(classFile.constant_pool);
-                    foundFields.add(fieldName);
-                    if (testAttribute(
-                            classFile,
-                            () -> (Synthetic_attribute) field.attributes.get(Attribute.Synthetic),
-                            field.access_flags::getFieldFlags,
-                            expectedFields,
-                            fieldName,
-                            "Testing field " + fieldName + " in class "
-                                    + className)) {
-                        ++numberOfSyntheticFields;
-                    }
-                }
-                checkContains(foundFields, expectedFields,
-                        "Checking that all fields of class " + className
-                                + " without Synthetic attribute have been found");
-                checkEquals(numberOfSyntheticFields,
-                        expectedClass == null ? 0 : expectedClass.expectedNumberOfSyntheticFields(),
-                        "Checking number of synthetic fields in class: " + className);
-            }
-            checkContains(foundClasses, expectedClasses.keySet(),
-                    "Checking that all classes have been found");
-            checkEquals(numberOfSyntheticClasses, expectedNumberOfSyntheticClasses,
-                    "Checking number of synthetic classes");
-        } catch (Exception e) {
-            addFailure(e);
-        } finally {
-            checkStatus();
-        }
-    }
-
-    private boolean testAttribute(ClassFile classFile,
-                               Supplier<Synthetic_attribute> getSyntheticAttribute,
-                               Supplier<Set<String>> getAccessFlags,
-                               Set<String> expectedMembers, String memberName,
-                               String info) throws ConstantPoolException {
-        echo(info);
-        String className = classFile.getName();
-        Synthetic_attribute attr = getSyntheticAttribute.get();
-        Set<String> flags = getAccessFlags.get();
-        if (expectedMembers.contains(memberName)) {
-            checkNull(attr, "Member must not have synthetic attribute : "
-                    + memberName);
-            checkFalse(flags.contains(ACC_SYNTHETIC),
-                    "Member must not have synthetic flag : " + memberName
-                            + " in class : " + className);
-            return false;
-        } else {
-            return checkNull(attr, "Synthetic attribute should not be generated")
-                    && checkTrue(flags.contains(ACC_SYNTHETIC), "Member must have synthetic flag : "
-                                + memberName + " in class : " + className);
-        }
-    }
-
-    private Set<String> toSet(String[] strings) {
-        HashSet<String> set = new HashSet<>();
-        Collections.addAll(set, strings);
-        return set;
-    }
-}
diff --git a/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java b/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java
index 8befbb143da..3f3a5f2a984 100644
--- a/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8042261
+ * @bug 8042261 8298405
  * @summary Checking that deprecated attribute does not apply to classes of deprecated package.
  * @library /tools/lib /tools/javac/lib ../lib
  * @enablePreview
@@ -67,6 +67,7 @@ private void test() throws TestFailedException {
             for (String src : sourceTest) {
                 test(PACKAGE_INFO, src);
                 test(PACKAGE_INFO.replaceAll("@Deprecated", "/** @deprecated */"), src);
+                test(PACKAGE_INFO.replaceAll("@Deprecated", "/// @deprecated\n"), src);
             }
         } catch (Exception e) {
             addFailure(e);
diff --git a/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java b/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java
index 607448dc5db..ebe77e69056 100644
--- a/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8042261
+ * @bug 8042261 8298405
  * @summary Checking what attribute is generated by annotation Deprecated
  *          or javadoc deprecated for field, method, class(inner/local), interface.
  * @library /tools/lib /tools/javac/lib ../lib
@@ -223,6 +223,8 @@ public void test() throws TestFailedException {
             for (String src : sources) {
                 test(src);
                 test(src.replaceAll("@Deprecated", "/** @deprecated */"));
+                test(src.replaceAll("deprecated", "notDeprecated2") // change element name
+                        .replaceAll("@Deprecated", "/// @deprecated\n"));
             }
         } catch (Exception e) {
             addFailure(e);
@@ -236,9 +238,9 @@ private void test(String src) {
         printf("Testing test case :\n%s\n", src);
         try {
             Map<String, ? extends JavaFileObject> classes = compile(src).getClasses();
-            String outerClassName = classes.containsKey("deprecated")
-                    ? "deprecated"
-                    : "notDeprecated";
+            String outerClassName = classes.keySet().stream()
+                    .filter(n -> !n.contains("$"))
+                    .findFirst().orElse(null);
             echo("Testing outer class : " + outerClassName);
             ClassModel cf = readClassFile(classes.get(outerClassName));
             DeprecatedAttribute attr = cf.findAttribute(Attributes.DEPRECATED).orElse(null);
diff --git a/test/langtools/tools/javac/classfiles/attributes/lib_legacy/TestBase.java b/test/langtools/tools/javac/classfiles/attributes/lib_legacy/TestBase.java
deleted file mode 100644
index 08de973cc3f..00000000000
--- a/test/langtools/tools/javac/classfiles/attributes/lib_legacy/TestBase.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import javax.tools.DiagnosticCollector;
-import javax.tools.JavaCompiler;
-import javax.tools.JavaFileObject;
-import javax.tools.ToolProvider;
-
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPoolException;
-
-import toolbox.JavacTask;
-import toolbox.ToolBox;
-
-/**
- * Base class for class file attribute tests.
- * Contains methods for compiling generated sources in memory,
- * for reading files from disk and a lot of assert* methods.
- */
-public class TestBase {
-
-    public static final String LINE_SEPARATOR = System.lineSeparator();
-    public static final boolean isDumpOfSourceEnabled = Boolean.getBoolean("dump.src");
-
-    private <S> InMemoryFileManager compile(
-            List<String> options,
-            Function<S, ? extends JavaFileObject> src2JavaFileObject,
-            List<S> sources)
-            throws IOException, CompilationException {
-
-        JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
-        List<? extends JavaFileObject> src = sources.stream()
-                .map(src2JavaFileObject)
-                .collect(Collectors.toList());
-
-        DiagnosticCollector<? super JavaFileObject> dc = new DiagnosticCollector<>();
-        try (InMemoryFileManager fileManager
-                     = new InMemoryFileManager(compiler.getStandardFileManager(null, null, null))) {
-            JavaCompiler.CompilationTask task = compiler.getTask(null, fileManager, dc, options, null, src);
-            boolean success = task.call();
-            if (!success) {
-                String errorMessage = dc.getDiagnostics().stream()
-                        .map(Object::toString)
-                        .collect(Collectors.joining("\n"));
-                throw new CompilationException("Compilation Error\n\n" + errorMessage);
-            }
-            return fileManager;
-        }
-    }
-
-    /**
-     * Compiles sources in memory.
-     *
-     * @param sources to compile
-     * @return in-memory file manager which contains class files and class loader
-     */
-    public InMemoryFileManager compile(String... sources)
-            throws IOException, CompilationException {
-        return compile(Collections.emptyList(), sources);
-    }
-
-    /**
-     * Compiles sources in memory.
-     *
-     * @param options compiler options.
-     * @param sources sources to compile.
-     * @return in-memory file manager which contains class files and class loader.
-     */
-    public InMemoryFileManager compile(List<String> options, String... sources)
-            throws IOException, CompilationException {
-        return compile(options, ToolBox.JavaSource::new, Arrays.asList(sources));
-    }
-
-    /**
-     * Compiles sources in memory.
-     *
-     * @param sources sources[i][0] - name of file, sources[i][1] - sources.
-     * @return in-memory file manager which contains class files and class loader.
-     */
-    public InMemoryFileManager compile(String[]... sources) throws IOException,
-            CompilationException {
-        return compile(Collections.emptyList(), sources);
-    }
-
-    /**
-     * Compiles sources in memory.
-     *
-     * @param options compiler options
-     * @param sources sources[i][0] - name of file, sources[i][1] - sources.
-     * @return in-memory file manager which contains class files and class loader.
-     */
-    public InMemoryFileManager compile(List<String> options, String[]... sources)
-            throws IOException, CompilationException {
-        return compile(options, src -> new ToolBox.JavaSource(src[0], src[1]), Arrays.asList(sources));
-    }
-
-    /**
-     * Returns class file that is read from {@code is}.
-     *
-     * @param is an input stream
-     * @return class file that is read from {@code is}
-     * @throws IOException if I/O error occurs
-     * @throws ConstantPoolException if constant pool error occurs
-     */
-    public ClassFile readClassFile(InputStream is) throws IOException, ConstantPoolException {
-        return ClassFile.read(is);
-    }
-
-    /**
-     * Returns class file that is read from {@code fileObject}.
-     *
-     * @param fileObject a file object
-     * @return class file that is read from {@code fileObject}
-     * @throws IOException if I/O error occurs
-     * @throws ConstantPoolException if constant pool error occurs
-     */
-    public ClassFile readClassFile(JavaFileObject fileObject) throws IOException, ConstantPoolException {
-        try (InputStream is = fileObject.openInputStream()) {
-            return readClassFile(is);
-        }
-    }
-
-    /**
-     * Returns class file that corresponds to {@code clazz}.
-     *
-     * @param clazz a class
-     * @return class file that is read from {@code clazz}
-     * @throws IOException if I/O error occurs
-     * @throws ConstantPoolException if constant pool error occurs
-     */
-    public ClassFile readClassFile(Class<?> clazz) throws IOException, ConstantPoolException {
-        return readClassFile(getClassFile(clazz));
-    }
-
-    /**
-     * Returns class file that corresponds to {@code className}.
-     *
-     * @param className a class name
-     * @return class file that is read from {@code className}
-     * @throws IOException if I/O error occurs
-     * @throws ConstantPoolException if constant pool error occurs
-     */
-    public ClassFile readClassFile(String className) throws IOException, ConstantPoolException {
-        return readClassFile(getClassFile(className + ".class"));
-    }
-
-    /**
-     * Returns class file that is read from {@code file}.
-     *
-     * @param file a file
-     * @return class file that is read from {@code file}
-     * @throws IOException if I/O error occurs
-     * @throws ConstantPoolException if constant pool error occurs
-     */
-    public ClassFile readClassFile(File file) throws IOException, ConstantPoolException {
-        try (InputStream is = new FileInputStream(file)) {
-            return readClassFile(is);
-        }
-    }
-
-    public void assertEquals(Object actual, Object expected, String message) {
-        if (!Objects.equals(actual, expected))
-            throw new AssertionFailedException(String.format("%s%nGot: %s, Expected: %s",
-                    message, actual, expected));
-    }
-
-    public void assertNull(Object actual, String message) {
-        assertEquals(actual, null, message);
-    }
-
-    public void assertNotNull(Object actual, String message) {
-        if (Objects.isNull(actual)) {
-            throw new AssertionFailedException(message + " : Expected not null value");
-        }
-    }
-
-    public void assertTrue(boolean actual, String message) {
-        assertEquals(actual, true, message);
-    }
-
-    public void assertFalse(boolean actual, String message) {
-        assertEquals(actual, false, message);
-    }
-
-    public void assertContains(Set<?> found, Set<?> expected, String message) {
-        Set<?> copy = new HashSet<>(expected);
-        copy.removeAll(found);
-        assertTrue(found.containsAll(expected), message + " : " + copy);
-    }
-
-    public void writeToFile(Path path, String source) throws IOException {
-        try (BufferedWriter writer = Files.newBufferedWriter(path)) {
-            writer.write(source);
-        }
-    }
-
-    public void writeToFileIfEnabled(Path path, String source) throws IOException {
-        if (isDumpOfSourceEnabled) {
-            writeToFile(path, source);
-        } else {
-            System.err.println("Source dumping disabled. To enable, run the test with '-Ddump.src=true'");
-        }
-    }
-
-    public File getSourceDir() {
-        return new File(System.getProperty("test.src", "."));
-    }
-
-    public File getClassDir() {
-        return new File(System.getProperty("test.classes", TestBase.class.getResource(".").getPath()));
-    }
-
-    public File getSourceFile(String fileName) {
-        return new File(getSourceDir(), fileName);
-    }
-
-    public File getClassFile(String fileName) {
-        return new File(getClassDir(), fileName);
-    }
-
-    public File getClassFile(Class clazz) {
-        return getClassFile(clazz.getName().replace(".", "/") + ".class");
-    }
-
-    /**
-     * Prints message to standard error. New lines are converted to system dependent NL.
-     *
-     * @param message string to print.
-     */
-    public void echo(String message) {
-        printf(message + "\n");
-    }
-
-    /**
-     * Substitutes args in template and prints result to standard error.
-     * New lines are converted to system dependent NL.
-     *
-     * @param template template in standard String.format(...) format.
-     * @param args arguments to substitute in template.
-     */
-    public void printf(String template, Object... args) {
-        System.err.printf(String.format(template, args).replace("\n", LINE_SEPARATOR));
-    }
-
-    public static class CompilationException extends Exception {
-
-        public CompilationException(String message) {
-            super(message);
-        }
-    }
-
-    public static class AssertionFailedException extends RuntimeException {
-        public AssertionFailedException(String message) {
-            super(message);
-        }
-    }
-}
diff --git a/test/langtools/tools/javac/classfiles/attributes/lib_legacy/TestResult.java b/test/langtools/tools/javac/classfiles/attributes/lib_legacy/TestResult.java
deleted file mode 100644
index 4c9662f110f..00000000000
--- a/test/langtools/tools/javac/classfiles/attributes/lib_legacy/TestResult.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.*;
-
-/**
- * This class accumulates test results. Test results can be checked with method {@code checkStatus}.
- */
-public class TestResult extends TestBase {
-
-    private final List<Info> testCasesInfo;
-
-    public TestResult() {
-        testCasesInfo = new ArrayList<>();
-    }
-
-    /**
-     * Adds new test case info.
-     *
-     * @param info the information about test case
-     */
-    public void addTestCase(String info) {
-        System.err.println("Test case: " + info);
-        testCasesInfo.add(new Info(info));
-    }
-
-    public boolean checkEquals(Object actual, Object expected, String message) {
-        echo("Testing : " + message);
-        if (!Objects.equals(actual, expected)) {
-            getLastTestCase().addAssert(String.format("%s\n" +
-                    "Expected: %s,\n" +
-                    "     Got: %s", message, expected, actual));
-            return false;
-        }
-        return true;
-    }
-
-    public boolean checkNull(Object actual, String message) {
-        return checkEquals(actual, null, message);
-    }
-
-    public boolean checkNotNull(Object actual, String message) {
-        echo("Testing : " + message);
-        if (Objects.isNull(actual)) {
-            getLastTestCase().addAssert(message + " : Expected not null value");
-            return false;
-        }
-        return true;
-    }
-
-    public boolean checkFalse(boolean actual, String message) {
-        return checkEquals(actual, false, message);
-    }
-
-    public boolean checkTrue(boolean actual, String message) {
-        return checkEquals(actual, true, message);
-    }
-
-    public boolean checkContains(Collection<?> found, Collection<?> expected, String message) {
-        Set<?> copy = new HashSet<>(expected);
-        copy.removeAll(found);
-        if (!found.containsAll(expected)) {
-            return checkTrue(false, message + " FAIL : not found elements : " + copy + "\n" +
-                    "Actual: " + found);
-        } else {
-            return checkTrue(true, message + " PASS : all elements found");
-        }
-    }
-
-    public void addFailure(Throwable th) {
-        if (testCasesInfo.isEmpty()) {
-            testCasesInfo.add(new Info("Dummy info"));
-        }
-        getLastTestCase().addFailure(th);
-    }
-
-    private Info getLastTestCase() {
-        if (testCasesInfo.isEmpty()) {
-            throw new IllegalStateException("Test case should be created");
-        }
-        return testCasesInfo.get(testCasesInfo.size() - 1);
-    }
-
-    /**
-     * Throws {@code TestFailedException} if one of the checks are failed
-     * or an exception occurs. Prints error message of failed test cases.
-     *
-     * @throws TestFailedException if one of the checks are failed
-     *                             or an exception occurs
-     */
-    public void checkStatus() throws TestFailedException {
-        int passed = 0;
-        int failed = 0;
-        for (Info testCaseInfo : testCasesInfo) {
-            if (testCaseInfo.isFailed()) {
-                String info = testCaseInfo.info().replace("\n", LINE_SEPARATOR);
-                String errorMessage = testCaseInfo.getMessage().replace("\n", LINE_SEPARATOR);
-                System.err.printf("Failure in test case:%n%s%n%s%n", info, errorMessage);
-                ++failed;
-            } else {
-                ++passed;
-            }
-        }
-        System.err.printf("Test cases: passed: %d, failed: %d, total: %d.%n", passed, failed, passed + failed);
-        if (failed > 0) {
-            throw new TestFailedException("Test failed");
-        }
-        if (passed + failed == 0) {
-            throw new TestFailedException("Test cases were not found");
-        }
-    }
-
-    @Override
-    public void printf(String template, Object... args) {
-        getLastTestCase().printf(template, args);
-    }
-
-    private static class Info {
-
-        private final String info;
-        private final StringWriter writer;
-        private boolean isFailed;
-
-        private Info(String info) {
-            this.info = info;
-            writer = new StringWriter();
-        }
-
-        public String info() {
-            return info;
-        }
-
-        public boolean isFailed() {
-            return isFailed;
-        }
-
-        public void printf(String template, Object... args) {
-            writer.write(String.format(template, args));
-        }
-
-        public void addFailure(Throwable th) {
-            isFailed = true;
-            printf("[ERROR] : %s\n", getStackTrace(th));
-        }
-
-        public void addAssert(String e) {
-            isFailed = true;
-            printf("[ASSERT] : %s\n", e);
-        }
-
-        public String getMessage() {
-            return writer.toString();
-        }
-
-        public String getStackTrace(Throwable throwable) {
-            StringWriter stringWriter = new StringWriter();
-            try (PrintWriter printWriter = new PrintWriter(stringWriter)) {
-                throwable.printStackTrace(printWriter);
-            }
-            return stringWriter.toString();
-        }
-    }
-
-    public static class TestFailedException extends Exception {
-        public TestFailedException(String message) {
-            super(message);
-        }
-    }
-}
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.enabled.out b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.enabled.out
index 76082537ed9..78285aa45d9 100644
--- a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.enabled.out
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.enabled.out
@@ -1,7 +1,7 @@
-DanglingDocCommentsClass.java:8:1: compiler.warn.dangling.doc.comment
-DanglingDocCommentsClass.java:11:1: compiler.warn.dangling.doc.comment
-DanglingDocCommentsClass.java:12:8: compiler.warn.dangling.doc.comment
-DanglingDocCommentsClass.java:12:69: compiler.warn.dangling.doc.comment
-DanglingDocCommentsClass.java:13:5: compiler.warn.dangling.doc.comment
-DanglingDocCommentsClass.java:17:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass.java:10:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass.java:13:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass.java:14:8: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass.java:14:69: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass.java:15:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass.java:19:5: compiler.warn.dangling.doc.comment
 6 warnings
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.java b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.java
index 2075bf4495a..3f6553d191f 100644
--- a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.java
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.java
@@ -5,6 +5,8 @@
  * @compile/ref=DanglingDocCommentsClass.enabled.out -XDrawDiagnostics -Xlint:dangling-doc-comments DanglingDocCommentsClass.java
  */
 
+// This is a test of duplicate and misplaced doc comments in a class, using traditional comments
+
 /** Bad/Extra Class Comment. */
 /** Good Class Comment. */
 @Deprecated
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Line.enabled.out b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Line.enabled.out
new file mode 100644
index 00000000000..3ed89c5f5bc
--- /dev/null
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Line.enabled.out
@@ -0,0 +1,7 @@
+DanglingDocCommentsClass_Line.java:11:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass_Line.java:15:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass_Line.java:17:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass_Line.java:19:9: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass_Line.java:21:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass_Line.java:26:5: compiler.warn.dangling.doc.comment
+6 warnings
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Line.java b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Line.java
new file mode 100644
index 00000000000..63c590e572c
--- /dev/null
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Line.java
@@ -0,0 +1,56 @@
+/*
+ * @test /nodynamiccopyright/
+ * @compile -Xlint:dangling-doc-comments DanglingDocCommentsClass_Line.java
+ * @compile/ref=empty.out -XDrawDiagnostics DanglingDocCommentsClass_Line.java
+ * @compile/ref=DanglingDocCommentsClass_Line.enabled.out -XDrawDiagnostics -Xlint:dangling-doc-comments DanglingDocCommentsClass_Line.java
+ * @compile/ref=empty.out -XDrawDiagnostics --disable-line-doc-comments -Xlint:dangling-doc-comments DanglingDocCommentsClass_Line.java
+ */
+
+// This is a test of duplicate and misplaced doc comments in a class, using end-of-line comments
+
+/// Bad/Extra Class Comment.
+
+/// Good Class Comment.
+@Deprecated
+/// Misplaced: after anno.
+public
+    /// Misplaced: after mods.
+    class DanglingDocCommentsClass_Line
+        /// Misplaced: after ident
+    {
+    /// Bad/Extra Field Comment.
+
+    /// Good Field Comment.
+    public int i;
+
+    /// Bad/Extra Method Comment.
+
+    /// Good Method Comment.
+    public void m1() { }
+
+    @SuppressWarnings("dangling-doc-comments")
+    /// Bad/misplaced/suppressed comment.
+    public void m2() { }
+
+    public void m3(boolean b) {
+        ///------------------
+        /// Box comment
+        ///------------------
+        if (b) return;
+    }
+
+    public void m4a() {
+        /// Not a doc comment.
+        System.out.println();
+        /// Not a doc comment; not dangling for m4b
+    }
+
+    /// Good comment for m4b; no dangling comments.
+    public void m4b() { }
+
+    /// Comment ignored here: does not affect decls in block
+    static {
+        /// Good comment.
+        int i = 0;
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Mixed.enabled.out b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Mixed.enabled.out
new file mode 100644
index 00000000000..1eda729da19
--- /dev/null
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Mixed.enabled.out
@@ -0,0 +1,4 @@
+DanglingDocCommentsClass_Mixed.java:13:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass_Mixed.java:17:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass_Mixed.java:21:5: compiler.warn.dangling.doc.comment
+3 warnings
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Mixed.java b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Mixed.java
new file mode 100644
index 00000000000..f23004f0571
--- /dev/null
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Mixed.java
@@ -0,0 +1,24 @@
+/*
+ * @test /nodynamiccopyright/
+ * @compile -Xlint:dangling-doc-comments DanglingDocCommentsClass_Mixed.java
+ * @compile/ref=empty.out -XDrawDiagnostics DanglingDocCommentsClass_Mixed.java
+ * @compile/ref=DanglingDocCommentsClass_Mixed.enabled.out -XDrawDiagnostics -Xlint:dangling-doc-comments DanglingDocCommentsClass_Mixed.java
+ * @compile/ref=empty.out -XDrawDiagnostics --disable-line-doc-comments -Xlint:dangling-doc-comments DanglingDocCommentsClass_Mixed.java
+ */
+
+// This is a test of duplicate doc comments in a class, using a mixture of traditional and end-of-line comments
+// It is a useful test case for a real-world scenario in which an end-of-line comment is
+// placed between a traditional doc comment and its declaration.
+
+/** First Class Comment. */
+/// Second Class Comment.
+@Deprecated public class DanglingDocCommentsClass_Mixed
+    {
+    /** First Field Comment. */
+    /// Second Field Comment.
+    public int i;
+
+    /** First Method Comment. */
+    /// Second Method Comment.
+    public void m1() { }
+}
\ No newline at end of file
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.enabled.out b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.enabled.out
index 78dfd6e9633..ddf1b2964de 100644
--- a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.enabled.out
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.enabled.out
@@ -1,8 +1,8 @@
-DanglingDocCommentsEnum.java:8:1: compiler.warn.dangling.doc.comment
-DanglingDocCommentsEnum.java:11:1: compiler.warn.dangling.doc.comment
-DanglingDocCommentsEnum.java:12:8: compiler.warn.dangling.doc.comment
-DanglingDocCommentsEnum.java:12:67: compiler.warn.dangling.doc.comment
-DanglingDocCommentsEnum.java:14:5: compiler.warn.dangling.doc.comment
-DanglingDocCommentsEnum.java:20:5: compiler.warn.dangling.doc.comment
-DanglingDocCommentsEnum.java:26:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:10:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:13:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:14:8: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:14:67: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:16:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:22:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:28:5: compiler.warn.dangling.doc.comment
 7 warnings
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.java b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.java
index eae98433b70..a4a06c79682 100644
--- a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.java
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.java
@@ -5,6 +5,8 @@
  * @compile/ref=DanglingDocCommentsEnum.enabled.out -XDrawDiagnostics -Xlint:dangling-doc-comments DanglingDocCommentsEnum.java
  */
 
+// This is a test of duplicate and misplaced doc comments in an enum class, using traditional comments
+
 /** Bad/Extra Enum Comment. */
 /** Good Enum Comment. */
 @Deprecated
diff --git a/test/langtools/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java b/test/langtools/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java
index 8df5d1e0939..fd321f3a269 100644
--- a/test/langtools/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java
+++ b/test/langtools/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,44 +25,51 @@
  * @test
  * @bug 8012723
  * @summary strictfp interface misses strictfp modifer on default method
- * @modules jdk.jdeps/com.sun.tools.classfile
- * @compile -source 16 -target 16 CheckACC_STRICTFlagOnDefaultMethodTest.java
+ * @library /tools/lib /test/lib
+ * @enablePreview
  * @run main CheckACC_STRICTFlagOnDefaultMethodTest
  */
 
+import jdk.test.lib.compiler.CompilerUtils;
+import toolbox.ToolBox;
+
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.MethodModel;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import java.io.File;
 import java.io.IOException;
 
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.Descriptor;
-import com.sun.tools.classfile.Descriptor.InvalidDescriptor;
-import com.sun.tools.classfile.Method;
-
-import static com.sun.tools.classfile.AccessFlags.ACC_STRICT;
-
 public class CheckACC_STRICTFlagOnDefaultMethodTest {
     private static final String AssertionErrorMessage =
         "All methods should have the ACC_STRICT access flag " +
         "please check output";
     private static final String offendingMethodErrorMessage =
         "Method %s of class %s doesn't have the ACC_STRICT access flag";
+    private static final String SOURCE = """
+            strictfp interface StrictfpInterface {
+                default void default_interface_method() {}
+                static void static_interface_method() {}
+            }
+            """;
 
     private List<String> errors = new ArrayList<>();
 
     public static void main(String[] args)
-            throws IOException, ConstantPoolException, InvalidDescriptor {
+            throws IOException {
         new CheckACC_STRICTFlagOnDefaultMethodTest().run();
     }
 
     private void run()
-            throws IOException, ConstantPoolException, InvalidDescriptor {
-        String testClasses = System.getProperty("test.classes");
-        check(testClasses,
-                "CheckACC_STRICTFlagOnDefaultMethodTest$StrictfpInterface.class");
-        if (errors.size() > 0) {
+            throws IOException {
+        Path src = Path.of("src");
+        Path out = Path.of("out");
+        ToolBox toolBox = new ToolBox();
+        toolBox.writeJavaFiles(src, SOURCE);
+        CompilerUtils.compile(src, out, "--release", "16");
+        check(out, "StrictfpInterface.class");
+        if (!errors.isEmpty()) {
             for (String error: errors) {
                 System.err.println(error);
             }
@@ -70,42 +77,17 @@ private void run()
         }
     }
 
-    void check(String dir, String... fileNames)
-        throws
-            IOException,
-            ConstantPoolException,
-            Descriptor.InvalidDescriptor {
+    void check(Path dir, String... fileNames) throws IOException {
         for (String fileName : fileNames) {
-            ClassFile classFileToCheck = ClassFile.read(new File(dir, fileName));
+            ClassModel classFileToCheck = ClassFile.of().parse(dir.resolve(fileName));
 
-            for (Method method : classFileToCheck.methods) {
-                if ((method.access_flags.flags & ACC_STRICT) == 0) {
+            for (MethodModel method : classFileToCheck.methods()) {
+                if ((method.flags().flagsMask() & ClassFile.ACC_STRICT) == 0) {
                     errors.add(String.format(offendingMethodErrorMessage,
-                            method.getName(classFileToCheck.constant_pool),
-                            classFileToCheck.getName()));
+                            method.methodName().stringValue(),
+                            classFileToCheck.thisClass().asInternalName()));
                 }
             }
         }
     }
-
-// this version of the code can be used when ClassFile API in not in a preview
-//    void check(String dir, String... fileNames) throws IOException {
-//        for (String fileName : fileNames) {
-//            ClassModel classFileToCheck = ClassFile.of().parse(new File(dir, fileName).toPath());
-//
-//            for (MethodModel method : classFileToCheck.methods()) {
-//                if ((method.flags().flagsMask() & ClassFile.ACC_STRICT) == 0) {
-//                    errors.add(String.format(offendingMethodErrorMessage,
-//                            method.methodName().stringValue(),
-//                            classFileToCheck.thisClass().asInternalName()));
-//                }
-//            }
-//        }
-//    }
-
-    strictfp interface StrictfpInterface {
-        default void default_interface_method() {}
-        static void static_interface_method() {}
-    }
-
 }
diff --git a/test/langtools/tools/javac/doctree/DocCommentTester.java b/test/langtools/tools/javac/doctree/DocCommentTester.java
index ca50d883417..f14dde2e567 100644
--- a/test/langtools/tools/javac/doctree/DocCommentTester.java
+++ b/test/langtools/tools/javac/doctree/DocCommentTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,12 +21,12 @@
  * questions.
  */
 
-import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.text.BreakIterator;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -37,11 +37,52 @@
 import java.util.stream.Collectors;
 
 import javax.lang.model.element.Name;
+import javax.lang.model.util.Elements;
 import javax.tools.Diagnostic;
 import javax.tools.JavaFileObject;
 import javax.tools.StandardJavaFileManager;
 
-import com.sun.source.doctree.*;
+import com.sun.source.doctree.AttributeTree;
+import com.sun.source.doctree.AuthorTree;
+import com.sun.source.doctree.CommentTree;
+import com.sun.source.doctree.DeprecatedTree;
+import com.sun.source.doctree.DocCommentTree;
+import com.sun.source.doctree.DocRootTree;
+import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.DocTreeVisitor;
+import com.sun.source.doctree.DocTypeTree;
+import com.sun.source.doctree.EndElementTree;
+import com.sun.source.doctree.EntityTree;
+import com.sun.source.doctree.ErroneousTree;
+import com.sun.source.doctree.EscapeTree;
+import com.sun.source.doctree.HiddenTree;
+import com.sun.source.doctree.IdentifierTree;
+import com.sun.source.doctree.IndexTree;
+import com.sun.source.doctree.InheritDocTree;
+import com.sun.source.doctree.LinkTree;
+import com.sun.source.doctree.LiteralTree;
+import com.sun.source.doctree.ParamTree;
+import com.sun.source.doctree.ProvidesTree;
+import com.sun.source.doctree.RawTextTree;
+import com.sun.source.doctree.ReferenceTree;
+import com.sun.source.doctree.ReturnTree;
+import com.sun.source.doctree.SeeTree;
+import com.sun.source.doctree.SerialDataTree;
+import com.sun.source.doctree.SerialFieldTree;
+import com.sun.source.doctree.SerialTree;
+import com.sun.source.doctree.SinceTree;
+import com.sun.source.doctree.SnippetTree;
+import com.sun.source.doctree.SpecTree;
+import com.sun.source.doctree.StartElementTree;
+import com.sun.source.doctree.SummaryTree;
+import com.sun.source.doctree.SystemPropertyTree;
+import com.sun.source.doctree.TextTree;
+import com.sun.source.doctree.ThrowsTree;
+import com.sun.source.doctree.UnknownBlockTagTree;
+import com.sun.source.doctree.UnknownInlineTagTree;
+import com.sun.source.doctree.UsesTree;
+import com.sun.source.doctree.ValueTree;
+import com.sun.source.doctree.VersionTree;
 import com.sun.source.tree.ClassTree;
 import com.sun.source.tree.CompilationUnitTree;
 import com.sun.source.tree.MethodTree;
@@ -53,6 +94,7 @@
 import com.sun.source.util.TreePath;
 import com.sun.source.util.TreePathScanner;
 import com.sun.tools.javac.api.JavacTool;
+import com.sun.tools.javac.api.JavacTrees;
 import com.sun.tools.javac.tree.DCTree;
 import com.sun.tools.javac.tree.DCTree.DCDocComment;
 import com.sun.tools.javac.tree.DCTree.DCErroneous;
@@ -72,33 +114,45 @@ public static void main(String... args) throws Exception {
         ArrayList<String> list = new ArrayList<>(Arrays.asList(args));
         if (!list.isEmpty() && "-useBreakIterator".equals(list.get(0))) {
             list.remove(0);
-            new DocCommentTester(true).run(list);
+            new DocCommentTester(true, true).run(list);
+        } else if (!list.isEmpty() && "-useStandardTransformer".equals(list.get(0))) {
+            list.remove(0);
+            new DocCommentTester(false, false).run(list);
         } else {
-            new DocCommentTester(false).run(list);
+            new DocCommentTester(false, true).run(list);
         }
     }
 
     public static final String BI_MARKER = "BREAK_ITERATOR";
     public final boolean useBreakIterator;
 
-    public DocCommentTester(boolean useBreakIterator) {
+    public final boolean useIdentityTransformer;
+
+    public DocCommentTester(boolean useBreakIterator, boolean useIdentityTtransformer) {
         this.useBreakIterator = useBreakIterator;
+        this.useIdentityTransformer = useIdentityTtransformer;
     }
 
     public void run(List<String> args) throws Exception {
         String testSrc = System.getProperty("test.src");
 
-        List<File> files = args.stream()
-                .map(arg -> new File(testSrc, arg))
+        List<Path> files = args.stream()
+                .map(arg -> Path.of(testSrc, arg))
                 .collect(Collectors.toList());
 
         JavacTool javac = JavacTool.create();
         StandardJavaFileManager fm = javac.getStandardFileManager(null, null, null);
 
-        Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjectsFromFiles(files);
+        Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjectsFromPaths(files);
 
         JavacTask t = javac.getTask(null, fm, null, null, null, fos);
-        final DocTrees trees = DocTrees.instance(t);
+        final JavacTrees trees = (JavacTrees) DocTrees.instance(t);
+
+        if (useIdentityTransformer) {
+            // disable default use of the "standard" transformer, so that we can examine
+            // the trees as created by DocCommentParser.
+            trees.setDocCommentTreeTransformer(new JavacTrees.IdentityTransformer());
+        }
 
         if (useBreakIterator) {
             // BreakIterators are locale dependent wrt. behavior
@@ -243,7 +297,9 @@ void check(TreePath path, Name name) {
             int start = test.useBreakIterator
                     ? source.indexOf("\n/*\n" + BI_MARKER + "\n", findName(source, name))
                     : source.indexOf("\n/*\n", findName(source, name));
+            assert start >= 0 : "start of AST comment not found";
             int end = source.indexOf("\n*/\n", start);
+            assert end >= 0 : "end of AST comment not found";
             int startlen = start + (test.useBreakIterator ? BI_MARKER.length() + 1 : 0) + 4;
             String expect = source.substring(startlen, end + 1);
             if (!found.equals(expect)) {
@@ -267,26 +323,26 @@ void check(TreePath path, Name name) {
          * changes are approved, the new files can be used to replace the old.
          */
         public static void main(String... args) throws Exception {
-            List<File> files = new ArrayList<>();
-            File o = null;
+            List<Path> files = new ArrayList<>();
+            Path o = null;
             for (int i = 0; i < args.length; i++) {
                 String arg = args[i];
                 if (arg.equals("-o"))
-                    o = new File(args[++i]);
+                    o = Path.of(args[++i]);
                 else if (arg.startsWith("-"))
                     throw new IllegalArgumentException(arg);
                 else {
-                    files.add(new File(arg));
+                    files.add(Path.of(arg));
                 }
             }
 
             if (o == null)
                 throw new IllegalArgumentException("no output dir specified");
-            final File outDir = o;
+            final Path outDir = o;
 
             JavacTool javac = JavacTool.create();
             StandardJavaFileManager fm = javac.getStandardFileManager(null, null, null);
-            Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjectsFromFiles(files);
+            Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjectsFromPaths(files);
 
             JavacTask t = javac.getTask(null, fm, null, null, null, fos);
             final DocTrees trees = DocTrees.instance(t);
@@ -305,8 +361,10 @@ public Void visitCompilationUnit(CompilationUnitTree tree, Void ignore) {
                     }
                     // remove existing gold by removing all block comments after the first '{'.
                     int start = source.indexOf("{");
+                    assert start >= 0 : "cannot find initial '{'";
                     while ((start = source.indexOf("\n/*\n", start)) != -1) {
                         int end = source.indexOf("\n*/\n");
+                        assert end >= 0 : "cannot find end of comment";
                         source = source.substring(0, start + 1) + source.substring(end + 4);
                     }
 
@@ -314,14 +372,12 @@ public Void visitCompilationUnit(CompilationUnitTree tree, Void ignore) {
                     super.visitCompilationUnit(tree, ignore);
 
                     // write the modified source
-                    File f = new File(tree.getSourceFile().getName());
-                    File outFile = new File(outDir, f.getName());
+                    var treeSourceFileName = tree.getSourceFile().getName();
+                    var outFile = outDir.resolve(treeSourceFileName);
                     try {
-                        try (FileWriter out = new FileWriter(outFile)) {
-                            out.write(source);
-                        }
+                        Files.writeString(outFile, source);
                     } catch (IOException e) {
-                        System.err.println("Can't write " + tree.getSourceFile().getName()
+                        System.err.println("Can't write " + treeSourceFileName
                                 + " to " + outFile + ": " + e);
                     }
                     return null;
@@ -542,6 +598,11 @@ public Void visitProvides(ProvidesTree node, Void p) {
                 return null;
             }
 
+            public Void visitRawText(RawTextTree node, Void p) {
+                header(node, compress(node.getContent()));
+                return null;
+            }
+
             public Void visitReference(ReferenceTree node, Void p) {
                 header(node, compress(node.getSignature()));
                 return null;
@@ -863,6 +924,8 @@ public Void scan(DocTree node, Void ignore) {
                             long startPos = dc.getSourcePosition(dcTree.getStartPosition());
                             String found = getFoundText(cs, (int) startPos, expect.length());
                             if (!found.equals(expect)) {
+                                System.err.println("node: " + node.getKind());
+                                System.err.println("startPos: " + startPos + " " + showPos(cs, (int) startPos));
                                 System.err.println("expect: " + expect);
                                 System.err.println("found:  " + found);
                                 error("mismatch");
@@ -895,6 +958,17 @@ String getExpectText(DocTree t) {
         String getFoundText(CharSequence cs, int pos, int len) {
             return (pos == -1) ? "" : cs.subSequence(pos, Math.min(pos + len, cs.length())).toString();
         }
+
+        String showPos(CharSequence cs, int pos) {
+            String s = cs.toString();
+            return (s.substring(Math.max(0, pos - 10), pos)
+                    + "["
+                    + s.charAt(pos)
+                    + "]"
+                    + s.substring(pos + 1, Math.min(s.length(), pos + 10)))
+                    .replace('\n', '|')
+                    .replace(' ', '_');
+        }
     }
 
     /**
@@ -917,8 +991,10 @@ void check(TreePath path, Name name) throws Exception {
             }
             boolean normalizeTags = !annos.contains("@NormalizeTags(false)");
 
-            String raw = trees.getDocComment(path);
-            String normRaw = normalize(raw, normalizeTags);
+            Elements.DocCommentKind ck = trees.getDocCommentKind(path);
+            boolean isLineComment = ck == Elements.DocCommentKind.END_OF_LINE;
+            String raw = trees.getDocComment(path).stripTrailing();
+            String normRaw = normalize(raw, isLineComment, normalizeTags);
 
             StringWriter out = new StringWriter();
             DocPretty dp = new DocPretty(out);
@@ -927,9 +1003,11 @@ void check(TreePath path, Name name) throws Exception {
 
             if (!pretty.equals(normRaw)) {
                 error("mismatch");
-                System.err.println("*** expected:");
+                System.err.println("*** raw: (" + raw.length() + ")");
+                System.err.println(raw.replace(" ", "_"));
+                System.err.println("*** expected: (" + normRaw.length() + ")");
                 System.err.println(normRaw.replace(" ", "_"));
-                System.err.println("*** found:");
+                System.err.println("*** found: (" + pretty.length() + ")");
                 System.err.println(pretty.replace(" ", "_"));
             }
         }
@@ -945,8 +1023,9 @@ void check(TreePath path, Name name) throws Exception {
          * @param normalizeTags whether to normalize inline tags
          * @return the normalized content
          */
-        String normalize(String s, boolean normalizeTags) {
-            String s2 = s.trim().replaceFirst("\\.\\s*\\n *@(?![@*])", ".\n@");
+        String normalize(String s, boolean isLineComment, boolean normalizeTags) {
+            String s2 = (isLineComment ? s : s.trim())
+                    .replaceFirst("\\.\\s*\\n *@(?![@*])", ".\n@"); // Between block tags
             StringBuilder sb = new StringBuilder();
             Pattern p = Pattern.compile("(?i)\\{@([a-z][a-z0-9.:-]*)( )?");
             Matcher m = p.matcher(s2);
@@ -965,7 +1044,7 @@ String normalize(String s, boolean normalizeTags) {
         }
 
         String normalizeFragment(String s) {
-            return s.replaceAll("\n[ \t]+@(?![@*])", "\n@");
+            return s.replaceAll("\n[ \t]+@(?!([@*]|dummy))", "\n@");
         }
 
         int copyLiteral(String s, int start, StringBuilder sb) {
diff --git a/test/langtools/tools/javac/doctree/ElementTest.java b/test/langtools/tools/javac/doctree/ElementTest.java
index 911814c5880..db2829cdce2 100644
--- a/test/langtools/tools/javac/doctree/ElementTest.java
+++ b/test/langtools/tools/javac/doctree/ElementTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8078320 8247788 8273244
+ * @bug 7021614 8078320 8247788 8273244 8298405
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -236,4 +236,16 @@ void comment() { }
 ]
 */
 
+// In Markdown mode, < does not introduce an element
+    ///abc < def
+    public void markdown() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, abc_<_def]
+  body: empty
+  block tags: empty
+]
+*/
+
 }
diff --git a/test/langtools/tools/javac/doctree/EntityTest.java b/test/langtools/tools/javac/doctree/EntityTest.java
index 57226746d2e..0b1db2c3409 100644
--- a/test/langtools/tools/javac/doctree/EntityTest.java
+++ b/test/langtools/tools/javac/doctree/EntityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8273244 8284908
+ * @bug 7021614 8273244 8284908 8298405
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -164,6 +164,17 @@ public void bad_entity_hex_value() { }
   body: empty
   block tags: empty
 ]
+*/
+
+    ///abc & def
+    public void markdown() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, abc_&_def]
+  body: empty
+  block tags: empty
+]
 */
 
 }
diff --git a/test/langtools/tools/javac/doctree/FirstSentenceTest.java b/test/langtools/tools/javac/doctree/FirstSentenceTest.java
index 3a973d87bd2..d69049fe8d6 100644
--- a/test/langtools/tools/javac/doctree/FirstSentenceTest.java
+++ b/test/langtools/tools/javac/doctree/FirstSentenceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -403,6 +403,148 @@ void p_at_nonzero() { }
     Text[TEXT, pos:8, _def._ghi_jkl]
   block tags: empty
 ]
+*/
+    ///Abc.
+    ///Def.
+    void simpleMarkdown() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc.]
+  body: 1
+    RawText[MARKDOWN, pos:5, Def.]
+  block tags: empty
+]
+*/
+/*
+BREAK_ITERATOR
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc.]
+  body: 1
+    RawText[MARKDOWN, pos:5, Def.]
+  block tags: empty
+]
+*/
+
+    ///Abc `p.q` def.
+    ///Ghi.
+    void markdownWithCodeSpan() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc_`p.q`_def.]
+  body: 1
+    RawText[MARKDOWN, pos:15, Ghi.]
+  block tags: empty
+]
+*/
+/*
+BREAK_ITERATOR
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc_`p.q`_def.]
+  body: 1
+    RawText[MARKDOWN, pos:15, Ghi.]
+  block tags: empty
+]
+*/
+
+    ///Abc {@code p.q} def.
+    ///Ghi.
+    void markdownWithCodeTag() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 3
+    RawText[MARKDOWN, pos:0, Abc_]
+    Literal[CODE, pos:4, p.q]
+    RawText[MARKDOWN, pos:15, _def.]
+  body: 1
+    RawText[MARKDOWN, pos:21, Ghi.]
+  block tags: empty
+]
+*/
+/*
+BREAK_ITERATOR
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 3
+    RawText[MARKDOWN, pos:0, Abc_]
+    Literal[CODE, pos:4, p.q]
+    RawText[MARKDOWN, pos:15, _def.]
+  body: 1
+    RawText[MARKDOWN, pos:21, Ghi.]
+  block tags: empty
+]
+*/
+
+    ///Abc <a href="example.com">example</a> def.
+    ///Ghi.
+    void markdownWithHtml() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc_<a_href="example.com">example</a>_def.]
+  body: 1
+    RawText[MARKDOWN, pos:43, Ghi.]
+  block tags: empty
+]
+*/
+/*
+BREAK_ITERATOR
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc_<a_href="example.com">example</a>_def.]
+  body: 1
+    RawText[MARKDOWN, pos:43, Ghi.]
+  block tags: empty
+]
+*/
+
+    ///Abc [example.com][example] def.
+    ///Ghi.
+    void markdownWithLinks() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc_[example.com][example]_def.]
+  body: 1
+    RawText[MARKDOWN, pos:32, Ghi.]
+  block tags: empty
+]
+*/
+/*
+BREAK_ITERATOR
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc_[example.com][example]_def.]
+  body: 1
+    RawText[MARKDOWN, pos:32, Ghi.]
+  block tags: empty
+]
+*/
+
+    ///Abc
+    ///
+    ///Def.
+    void markdownEndParaNoPeriod() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc]
+  body: 1
+    RawText[MARKDOWN, pos:5, Def.]
+  block tags: empty
+]
+*/
+/*
+BREAK_ITERATOR
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc]
+  body: 1
+    RawText[MARKDOWN, pos:5, Def.]
+  block tags: empty
+]
 */
 }
 
diff --git a/test/langtools/tools/javac/doctree/MDPrinter.java b/test/langtools/tools/javac/doctree/MDPrinter.java
new file mode 100644
index 00000000000..854471b83d8
--- /dev/null
+++ b/test/langtools/tools/javac/doctree/MDPrinter.java
@@ -0,0 +1,272 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 8298405
+ * @summary Make sure MDPrinter.java compiles
+ * @modules jdk.internal.md/jdk.internal.org.commonmark.node
+ *          jdk.internal.md/jdk.internal.org.commonmark.parser
+ * @compile MDPrinter.java
+ */
+
+import java.io.IOException;
+import java.io.PrintStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import jdk.internal.org.commonmark.node.BlockQuote;
+import jdk.internal.org.commonmark.node.BulletList;
+import jdk.internal.org.commonmark.node.Code;
+import jdk.internal.org.commonmark.node.CustomBlock;
+import jdk.internal.org.commonmark.node.CustomNode;
+import jdk.internal.org.commonmark.node.Document;
+import jdk.internal.org.commonmark.node.Emphasis;
+import jdk.internal.org.commonmark.node.FencedCodeBlock;
+import jdk.internal.org.commonmark.node.HardLineBreak;
+import jdk.internal.org.commonmark.node.Heading;
+import jdk.internal.org.commonmark.node.HtmlBlock;
+import jdk.internal.org.commonmark.node.HtmlInline;
+import jdk.internal.org.commonmark.node.Image;
+import jdk.internal.org.commonmark.node.IndentedCodeBlock;
+import jdk.internal.org.commonmark.node.Link;
+import jdk.internal.org.commonmark.node.LinkReferenceDefinition;
+import jdk.internal.org.commonmark.node.ListItem;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.node.OrderedList;
+import jdk.internal.org.commonmark.node.Paragraph;
+import jdk.internal.org.commonmark.node.SoftLineBreak;
+import jdk.internal.org.commonmark.node.SourceSpan;
+import jdk.internal.org.commonmark.node.StrongEmphasis;
+import jdk.internal.org.commonmark.node.Text;
+import jdk.internal.org.commonmark.node.ThematicBreak;
+import jdk.internal.org.commonmark.node.Visitor;
+import jdk.internal.org.commonmark.parser.IncludeSourceSpans;
+import jdk.internal.org.commonmark.parser.Parser;
+
+/**
+ * Debug printer for CommonMark nodes.
+ *
+ * Requires access to {@code jdk.internal.org.commonmark.node.*}.
+ *
+ * Conceptually based on javac's {@code DPrinter}.
+ */
+public class MDPrinter {
+    static class MDVisitor implements Visitor {
+
+        MDVisitor(String source, PrintStream out) {
+            this.source = source;
+            lines = source == null ? null : source.lines().toList();
+            this.out = out;
+        }
+
+        void visit(Node node) {
+            if (node == null) {
+                out.print("    ".repeat(depth));
+                out.println("*null*");
+            } else {
+                node.accept(this);
+            }
+        }
+
+        @Override
+        public void visit(BlockQuote blockQuote) {
+            defaultAction(blockQuote);
+        }
+
+        @Override
+        public void visit(BulletList bulletList) {
+            defaultAction(bulletList);
+        }
+
+        @Override
+        public void visit(Code code) {
+            defaultAction(code);
+        }
+
+        @Override
+        public void visit(Document document) {
+            defaultAction(document);
+        }
+
+        @Override
+        public void visit(Emphasis emphasis) {
+            defaultAction(emphasis);
+        }
+
+        @Override
+        public void visit(FencedCodeBlock fencedCodeBlock) {
+            defaultAction(fencedCodeBlock);
+        }
+
+        @Override
+        public void visit(HardLineBreak hardLineBreak) {
+            defaultAction(hardLineBreak);
+        }
+
+        @Override
+        public void visit(Heading heading) {
+            defaultAction(heading);
+        }
+
+        @Override
+        public void visit(ThematicBreak thematicBreak) {
+            defaultAction(thematicBreak);
+        }
+
+        @Override
+        public void visit(HtmlInline htmlInline) {
+            defaultAction(htmlInline);
+        }
+
+        @Override
+        public void visit(HtmlBlock htmlBlock) {
+            defaultAction(htmlBlock);
+        }
+
+        @Override
+        public void visit(Image image) {
+            defaultAction(image);
+        }
+
+        @Override
+        public void visit(IndentedCodeBlock indentedCodeBlock) {
+            defaultAction(indentedCodeBlock);
+        }
+
+        @Override
+        public void visit(Link link) {
+            defaultAction(link);
+        }
+
+        @Override
+        public void visit(ListItem listItem) {
+            defaultAction(listItem);
+        }
+
+        @Override
+        public void visit(OrderedList orderedList) {
+            defaultAction(orderedList);
+        }
+
+        @Override
+        public void visit(Paragraph paragraph) {
+            defaultAction(paragraph);
+        }
+
+        @Override
+        public void visit(SoftLineBreak softLineBreak) {
+            defaultAction(softLineBreak);
+        }
+
+        @Override
+        public void visit(StrongEmphasis strongEmphasis) {
+            defaultAction(strongEmphasis);
+        }
+
+        @Override
+        public void visit(Text text) {
+            defaultAction(text);
+        }
+
+        @Override
+        public void visit(LinkReferenceDefinition linkReferenceDefinition) {
+            defaultAction(linkReferenceDefinition);
+        }
+
+        @Override
+        public void visit(CustomBlock customBlock) {
+            defaultAction(customBlock);
+        }
+
+        @Override
+        public void visit(CustomNode customNode) {
+            defaultAction(customNode);
+        }
+
+        private final String source;
+        private final List<String> lines;
+        private final PrintStream out;
+
+        int depth = 0;
+
+        protected void defaultAction(Node node) {
+            out.print("    ".repeat(depth));
+            out.print(node.getClass().getSimpleName());
+            out.print(" ");
+            out.println(abbrev(node.toString(), 64));
+            int i = 0;
+            for (var ss : node.getSourceSpans()) {
+                out.print("    ".repeat(depth));
+                out.print("  span[" + (i++) + "]: " + ss);
+                out.println(abbrev(source(ss).replace(' ', '_').replace('\n', '|'), 64));
+            }
+            depth++;
+            try {
+                for (Node c = node.getFirstChild(); c != null; c = c.getNext()) {
+                    c.accept(this);
+                }
+            } finally {
+                depth--;
+            }
+        }
+
+        String source(SourceSpan ss) {
+            if (source == null) {
+                return "no source";
+            }
+            if (ss.getLineIndex() >= lines.size()) {
+                return "error: insufficient lines [" + lines.size() + "]";
+            }
+            String line = lines.get(ss.getLineIndex());
+            if (ss.getColumnIndex() + ss.getLength() > line.length()) {
+                return "error: bounds";
+            }
+            return line.substring(ss.getColumnIndex(), ss.getColumnIndex() + ss.getLength());
+        }
+
+        String abbrev(String s, int maxLen) {
+            return s.length() < maxLen ? s
+                    : s.substring(0, maxLen / 2) + "..." + s.substring(s.length() - maxLen / 2);
+
+        }
+    }
+
+    public static void main(String... args) throws IOException {
+        show(Files.readString(Path.of(args[0])));
+    }
+
+    public static void show(String source) {
+        Parser parser = Parser.builder()
+                .includeSourceSpans(IncludeSourceSpans.BLOCKS_AND_INLINES)
+                .build();
+        Node document = parser.parse(source);
+
+        show(document, source, System.err);
+    }
+
+    public static void show(Node node, String source, PrintStream out) {
+        new MDVisitor(source, out).visit(node);
+    }
+
+}
diff --git a/test/langtools/tools/javac/doctree/MarkdownTest.java b/test/langtools/tools/javac/doctree/MarkdownTest.java
new file mode 100644
index 00000000000..8da9e6ed44c
--- /dev/null
+++ b/test/langtools/tools/javac/doctree/MarkdownTest.java
@@ -0,0 +1,617 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8298405
+ * @summary Markdown support in the standard doclet
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
+ * @build DocCommentTester
+ * @run main DocCommentTester MarkdownTest.java
+ * @run main DocCommentTester -useStandardTransformer MarkdownTest.java
+ */
+
+/*
+ * Test for handling Markdown content.
+ *
+ * In the tests for code spans and code blocks, "@dummy" is used as a dummy inline
+ * or block tag to verify that it is skipped as part of the code span or code block.
+ * In other words, "@dummy" should appear as a literal part of the Markdown content.
+ * Conversely, standard tags are used to verify that a fragment of text is not being
+ * skipped as a code span or code block. In other words, they should be recognized as tags
+ * and not skipped as part of any Markdown content.
+ *
+ * "@dummy" is also known to DocCommentTester and will not have any preceding whitespace
+ * removed during normalization.
+ */
+
+class MarkdownTest {
+    ///abc < def & ghi {@code 123} jkl {@unknown} mno.
+    void descriptionMix() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 5
+    RawText[MARKDOWN, pos:0, abc_<_def_&_ghi_]
+    Literal[CODE, pos:16, 123]
+    RawText[MARKDOWN, pos:27, _jkl_]
+    UnknownInlineTag[UNKNOWN_INLINE_TAG, pos:32
+      tag:unknown
+      content: 1
+        Text[TEXT, pos:41]
+    ]
+    RawText[MARKDOWN, pos:42, _mno.]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///@since abc < def & ghi {@code 123} jkl {@unknown} mno.
+    void blockTagMix() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: empty
+  body: empty
+  block tags: 1
+    Since[SINCE, pos:0
+      body: 5
+        RawText[MARKDOWN, pos:7, abc_<_def_&_ghi_]
+        Literal[CODE, pos:23, 123]
+        RawText[MARKDOWN, pos:34, _jkl_]
+        UnknownInlineTag[UNKNOWN_INLINE_TAG, pos:39
+          tag:unknown
+          content: 1
+            Text[TEXT, pos:48]
+        ]
+        RawText[MARKDOWN, pos:49, _mno.]
+    ]
+]
+*/
+
+    ///123 {@link Object abc < def & ghi {@code 123} jkl {@unknown} mno} 456.
+    void inlineTagMix() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 3
+    RawText[MARKDOWN, pos:0, 123_]
+    Link[LINK, pos:4
+      reference:
+        Reference[REFERENCE, pos:11, Object]
+      body: 5
+        RawText[MARKDOWN, pos:18, abc_<_def_&_ghi_]
+        Literal[CODE, pos:34, 123]
+        RawText[MARKDOWN, pos:45, _jkl_]
+        UnknownInlineTag[UNKNOWN_INLINE_TAG, pos:50
+          tag:unknown
+          content: 1
+            Text[TEXT, pos:59]
+        ]
+        RawText[MARKDOWN, pos:60, _mno]
+    ]
+    RawText[MARKDOWN, pos:65, _456.]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///123 `abc` 456.
+    void simpleCodeSpan() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123_`abc`_456.]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///123 `abc`
+    void simpleCodeSpanAtEndOfInput() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123_`abc`]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///123 ```abc``` 456.
+    void mediumCodeSpan() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123_```abc```_456.]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///123 ```abc`def``` 456.
+    void mediumCodeSpanWithBackTicks() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123_```abc`def```_456.]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///123 ```abc{@dummy ...}def``` 456.
+    void mediumCodeSpanWithNotInlineTag() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123_```abc{@dummy_...}def```_456.]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///123 ```abc
+    ///@dummy def``` 456.
+    void mediumCodeSpanWithNotBlockTag() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123_```abc|@dummy_def```_456.]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///```
+    ///abc
+    ///```
+    ///456.
+    void simpleFencedCodeBlock_backtick() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 1
+    RawText[MARKDOWN, pos:5, ```|abc|```|456.]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///~~~
+    ///abc
+    ///{@dummy ...}
+    ///~~~
+    ///456.
+    void simpleFencedCodeBlock_tilde() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 1
+    RawText[MARKDOWN, pos:5, ~~~|abc|{@dummy_...}|~~~|456.]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///```
+    ///abc
+    ///```
+    void simpleFencedCodeBlock_atEndOfInput() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 1
+    RawText[MARKDOWN, pos:5, ```|abc|```]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///```
+    ///abc {@dummy def} ghi
+    ///```
+    ///456.
+    void fencedCodeBlockWithInlineTag_backtick() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 1
+    RawText[MARKDOWN, pos:5, ```|abc_{@dummy_def}_ghi|```|456.]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///```
+    ///abc ``` ghi
+    ///{@dummy ...}
+    ///```
+    ///456.
+    void fencedCodeBlockWithBackTicks_backtick() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 1
+    RawText[MARKDOWN, pos:5, ```|abc_```_ghi|{@dummy_...}|```|456.]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///```abc`def``` 456.
+    void codeSpanNotCodeBlock() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 1
+    RawText[MARKDOWN, pos:5, ```abc`def```_456.]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///```
+    ///{@code ...}
+    ///~~~
+    ///456.
+    void mismatchedFences() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 1
+    RawText[MARKDOWN, pos:5, ```|{@code_...}|~~~|456.]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///`````
+    ///``` ghi
+    ///{@dummy ...}
+    ///`````
+    ///456.
+    void fencedCodeBlockWithShortFence_backtick() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 1
+    RawText[MARKDOWN, pos:5, `````|```_ghi|{@dummy_...}|`````|456.]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///
+    ///    abc {@dummy ...}
+    ///    @dummy
+    ///    def
+    ///
+    ///456 {@code ...}.
+    void indentedCodeBlock_afterBlank() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 3
+    RawText[MARKDOWN, pos:10, abc_{@dummy_...}|____@dummy|____def||456_]
+    Literal[CODE, pos:51, ...]
+    RawText[MARKDOWN, pos:62, .]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///### heading
+    ///    abc {@dummy ...}
+    ///    @dummy
+    ///    def
+    ///456 {@code ...}.
+    void indentedCodeBlock_afterATX() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 3
+    RawText[MARKDOWN, pos:5, ###_heading|____abc_{@dummy_...}|____@dummy|____def|456_]
+    Literal[CODE, pos:61, ...]
+    RawText[MARKDOWN, pos:72, .]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///Heading
+    ///-------
+    ///    abc {@dummy ...}
+    ///    @dummy
+    ///    def
+    ///456 {@code ...}.
+    void indentedCodeBlock_afterSetext() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 3
+    RawText[MARKDOWN, pos:5, Heading|-------|____abc_{@dummy_...}|____@dummy|____def|456_]
+    Literal[CODE, pos:65, ...]
+    RawText[MARKDOWN, pos:76, .]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///- - - - -
+    ///    abc {@dummy ...}
+    ///    @dummy
+    ///    def
+    ///456 {@code ...}.
+    void indentedCodeBlock_afterThematicBreak() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 3
+    RawText[MARKDOWN, pos:5, -_-_-_-_-|____abc_{@dummy_...}|____@dummy|____def|456_]
+    Literal[CODE, pos:59, ...]
+    RawText[MARKDOWN, pos:70, .]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///```
+    ///abc
+    ///{@dummy}
+    ///def
+    ///```
+    ///    abc {@dummy ...}
+    ///    @dummy
+    ///    def
+    ///456 {@code ...}.
+    void indentedCodeBlock_afterFencedCodeBlock() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 3
+    RawText[MARKDOWN, pos:5, ```|abc|{@dummy}|def|```|____abc...mmy_...}|____@dummy|____def|456_]
+    Literal[CODE, pos:74, ...]
+    RawText[MARKDOWN, pos:85, .]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///
+    ///```
+    ///public class HelloWorld {
+    ///    @dummy
+    ///    public static void main(String... args) {
+    ///        System.out.println("Hello World");
+    ///    }
+    ///}
+    ///```
+    ///456 {@code ...}.
+    void fencedHelloWorld() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 3
+    RawText[MARKDOWN, pos:6, ```|public_class_HelloWorld_{|__..."Hello_World");|____}|}|```|456_]
+    Literal[CODE, pos:152, ...]
+    RawText[MARKDOWN, pos:163, .]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///
+    ///    public class HelloWorld {
+    ///        @dummy
+    ///        public static void main(String... args) {
+    ///            System.out.println("Hello World");
+    ///        }
+    ///    }
+    ///
+    ///456 {@code ...}.
+    void indentedHelloWorld() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 3
+    RawText[MARKDOWN, pos:10, public_class_HelloWorld_{|______...o_World");|________}|____}||456_]
+    Literal[CODE, pos:169, ...]
+    RawText[MARKDOWN, pos:180, .]
+  block tags: empty
+]
+*/
+
+    ///{@summary abc ``code-span {@dummy ...}`` def {@code ...} }
+    ///rest.
+    void codeSpanInInlineTag() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    Summary[SUMMARY, pos:0
+      summary: 3
+        RawText[MARKDOWN, pos:10, abc_``code-span_{@dummy_...}``_def_]
+        Literal[CODE, pos:45, ...]
+        RawText[MARKDOWN, pos:56, _]
+    ]
+  body: 1
+    RawText[MARKDOWN, pos:58, |rest.]
+  block tags: empty
+]
+*/
+
+    ///{@summary abc
+    ///```code-block
+    ///  {@dummy ...}
+    ///```
+    ///def {@code ...} }
+    ///rest.
+    void codeBlockInInlineTag() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    Summary[SUMMARY, pos:0
+      summary: 3
+        RawText[MARKDOWN, pos:10, abc|```code-block|__{@dummy_...}|```|def_]
+        Literal[CODE, pos:51, ...]
+        RawText[MARKDOWN, pos:62, _]
+    ]
+  body: 1
+    RawText[MARKDOWN, pos:64, |rest.]
+  block tags: empty
+]
+*/
+
+    ///abc `
+    ///def
+    void unmatchedBackTick() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, abc_`|def]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///{@summary abc `
+    ///def}
+    ///rest
+    void unmatchedBackTickInInline() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    Summary[SUMMARY, pos:0
+      summary: 1
+        RawText[MARKDOWN, pos:10, abc_`|def]
+    ]
+  body: 1
+    RawText[MARKDOWN, pos:20, |rest]
+  block tags: empty
+]
+*/
+
+// While this is an important test case, it is also a negative one
+// (that is, the AST contains an Erroneous node).
+// Note how the backticks "match" across the end of the inline tag.
+// That's unfortunate, but cannot reasonably be detected without
+// examining the contents of a code span.
+// Not surprisingly, some of the checks fail for this (bad) test case.
+// * PrettyChecker fails because it does not handle an unterminated inline tag.
+// * StartEndPosChecker fails because it does not handle an unterminated inline tag.
+//
+// Disabled until we can either enhance the checkers or select which
+// checkers to use.
+
+//    ///{@summary abc `
+//    ///def}
+//    ///rest `more`
+//    ///
+//    void unmatchedBackTickInInline2() { }
+///*
+//DocComment[DOC_COMMENT, pos:0
+//  firstSentence: 1
+//    Summary[SUMMARY, pos:0
+//      summary: 1
+//        Erroneous[ERRONEOUS, pos:10, prefPos:31
+//          code: compiler.err.dc.unterminated.inline.tag
+//          body: abc_`|def}|rest_`more`
+//        ]
+//    ]
+//  body: empty
+//  block tags: empty
+//]
+//*/
+
+    ///Indented by 0.
+    ///
+    ///   * list
+    ///
+    ///    code block
+    ///
+    ///done.
+    void indent0() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Indented_by_0.]
+  body: 1
+    RawText[MARKDOWN, pos:19, *_list||____code_block||done.]
+  block tags: empty
+]
+*/
+
+    /// Indented by 1.
+    ///
+    ///    * list
+    ///
+    ///     code block
+    ///
+    /// done.
+    void indent1() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Indented_by_1.]
+  body: 1
+    RawText[MARKDOWN, pos:19, *_list||____code_block||done.]
+  block tags: empty
+]
+*/
+
+    ///        Indented by 8.
+    ///
+    ///           * list
+    ///
+    ///            code block
+    ///
+    ///        done.
+    void indent8() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Indented_by_8.]
+  body: 1
+    RawText[MARKDOWN, pos:19, *_list||____code_block||done.]
+  block tags: empty
+]
+*/
+
+
+}
diff --git a/test/langtools/tools/javac/doctree/MarkdownTransformerPositionTest.java b/test/langtools/tools/javac/doctree/MarkdownTransformerPositionTest.java
new file mode 100644
index 00000000000..4b4e44ef427
--- /dev/null
+++ b/test/langtools/tools/javac/doctree/MarkdownTransformerPositionTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary test case for Markdown positions
+ * @run main/othervm --limit-modules jdk.compiler MarkdownTransformerPositionTest
+ * @run main MarkdownTransformerPositionTest
+ */
+
+import com.sun.source.doctree.DocCommentTree;
+import com.sun.source.doctree.RawTextTree;
+import com.sun.source.tree.*;
+import com.sun.source.util.*;
+
+import java.net.URI;
+import java.util.*;
+import javax.lang.model.element.Element;
+import javax.tools.*;
+
+/*
+ * Custom test case for positions of RawTextTree nodes after passing through
+ * main MarkdownTransformer, or not.
+ * See https://github.com/openjdk/jdk/pull/16388#discussion_r1479306878
+ */
+public class MarkdownTransformerPositionTest {
+
+    public static void main(String... args) throws Exception {
+        MarkdownTransformerPositionTest t = new MarkdownTransformerPositionTest();
+
+        t.simpleTest();
+        t.testWithReplacements();
+    }
+
+    private void simpleTest() throws Exception {
+        runTest("""
+                /// Markdown test
+                ///
+                /// @author testAuthor
+                public class Test {
+                }
+                """,
+                "Markdown test",
+                "testAuthor");
+    }
+
+    private void testWithReplacements() throws Exception {
+        runTest("""
+                /// Markdown \uFFFC test \uFFFC with \uFFFC replacements.
+                ///
+                /// @author testAuthor
+                public class Test {
+                }
+                """,
+                "Markdown \uFFFC test \uFFFC with \uFFFC replacements.",
+                "testAuthor");
+    }
+
+    private void runTest(String source, String... expectedRawSpans) throws Exception {
+        JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
+        JavacTask task = (JavacTask)comp.getTask(null, null, null, null, null, Arrays.asList(new JavaSource(source)));
+        CompilationUnitTree cu = task.parse().iterator().next();
+        task.analyze();
+        DocTrees trees = DocTrees.instance(task);
+        List<String> rawSpans = new ArrayList<>();
+        TreePath clazzTP = new TreePath(new TreePath(cu), cu.getTypeDecls().get(0));
+        Element clazz = trees.getElement(clazzTP);
+        DocCommentTree docComment = trees.getDocCommentTree(clazz);
+
+        new DocTreeScanner<Void, Void>() {
+            @Override
+            public Void visitRawText(RawTextTree node, Void p) {
+                int start = (int) trees.getSourcePositions().getStartPosition(cu, docComment, node);
+                int end = (int) trees.getSourcePositions().getEndPosition(cu, docComment, node);
+                rawSpans.add(source.substring(start, end));
+                return super.visitRawText(node, p);
+            }
+        }.scan(docComment, null);
+
+        List<String> expectedRawSpansList = List.of(expectedRawSpans);
+
+        if (!expectedRawSpansList.equals(rawSpans)) {
+            throw new AssertionError("Incorrect raw text spans, should be: " +
+                    expectedRawSpansList + ", but is: " + rawSpans);
+        }
+
+        System.err.println("Test result: success, boot modules: " + ModuleLayer.boot().modules());
+    }
+
+    static class JavaSource extends SimpleJavaFileObject {
+
+        private final String source;
+
+        public JavaSource(String source) {
+            super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
+            this.source = source;
+        }
+
+        @Override
+        public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+            return source;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/hotspot/share/gc/shared/spaceDecorator.inline.hpp b/test/langtools/tools/javac/generics/wildcards/SOEWhileProvingDisjointnessTest.java
similarity index 60%
rename from src/hotspot/share/gc/shared/spaceDecorator.inline.hpp
rename to test/langtools/tools/javac/generics/wildcards/SOEWhileProvingDisjointnessTest.java
index e668353d40f..8ec946609f3 100644
--- a/src/hotspot/share/gc/shared/spaceDecorator.inline.hpp
+++ b/test/langtools/tools/javac/generics/wildcards/SOEWhileProvingDisjointnessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -19,22 +19,21 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
- *
  */
 
-#ifndef SHARE_GC_SHARED_SPACEDECORATOR_INLINE_HPP
-#define SHARE_GC_SHARED_SPACEDECORATOR_INLINE_HPP
-
-#include "gc/shared/spaceDecorator.hpp"
-
-#include "gc/parallel/mutableSpace.hpp"
-#include "gc/shared/space.hpp"
-#include "utilities/globalDefinitions.hpp"
-
-inline HeapWord* GenSpaceMangler::top() const { return _sp->top(); }
-inline HeapWord* GenSpaceMangler::end() const { return _sp->end(); }
+/*
+ * @test
+ * @bug 8324809
+ * @summary compiler can crash with SOE while proving if two recursive types are disjoint
+ * @compile SOEWhileProvingDisjointnessTest.java
+ */
 
-inline HeapWord* MutableSpaceMangler::top() const { return _sp->top(); }
-inline HeapWord* MutableSpaceMangler::end() const { return _sp->end(); }
+class SOEWhileProvingDisjointnessTest {
+    class Criteria<B extends Builder<? extends Criteria>> {
+        public <D extends Builder<E>, E extends Criteria<D>> D builder() {
+            return (D) new Builder<>();
+        }
+    }
 
-#endif // SHARE_GC_SHARED_SPACEDECORATOR_INLINE_HPP
+    class Builder<C extends Criteria<? extends Builder<C>>> {}
+}
diff --git a/test/langtools/tools/javac/importChecks/ImportIsFullyQualified.out b/test/langtools/tools/javac/importChecks/ImportIsFullyQualified.out
index 33e7d2f71c3..89495c2b93d 100644
--- a/test/langtools/tools/javac/importChecks/ImportIsFullyQualified.out
+++ b/test/langtools/tools/javac/importChecks/ImportIsFullyQualified.out
@@ -1,2 +1,2 @@
-ImportIsFullyQualified.java:11:1: compiler.err.doesnt.exist: JobAttributes
+ImportIsFullyQualified.java:11:8: compiler.err.doesnt.exist: JobAttributes
 1 error
diff --git a/test/langtools/tools/javac/importChecks/ImportsObservable.out b/test/langtools/tools/javac/importChecks/ImportsObservable.out
index e6b6e51e4bb..28ba84c6aa4 100644
--- a/test/langtools/tools/javac/importChecks/ImportsObservable.out
+++ b/test/langtools/tools/javac/importChecks/ImportsObservable.out
@@ -1,2 +1,2 @@
-ImportsObservable.java:9:1: compiler.err.doesnt.exist: javax
+ImportsObservable.java:9:8: compiler.err.doesnt.exist: javax
 1 error
diff --git a/test/langtools/tools/javac/lambda/LambdaTestStrictFPFlag.java b/test/langtools/tools/javac/lambda/LambdaTestStrictFPFlag.java
index b24144aa80f..47bc3f78f79 100644
--- a/test/langtools/tools/javac/lambda/LambdaTestStrictFPFlag.java
+++ b/test/langtools/tools/javac/lambda/LambdaTestStrictFPFlag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,27 +25,49 @@
  * @test
  * @bug 8046060
  * @summary Different results of floating point multiplication for lambda code block
- * @modules jdk.jdeps/com.sun.tools.classfile
- * @compile -source 16 -target 16 LambdaTestStrictFPFlag.java
+ * @library /tools/lib /test/lib
+ * @enablePreview
  * @run main LambdaTestStrictFPFlag
  */
 
-import java.io.*;
-import java.net.URL;
-import com.sun.tools.classfile.*;
+import jdk.test.lib.compiler.CompilerUtils;
+import toolbox.ToolBox;
+
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.MethodModel;
+import java.nio.file.Path;
 
 public class LambdaTestStrictFPFlag {
+    private static final String SOURCE = """
+            class Test {
+                strictfp void test() {
+                    Face itf = () -> { };
+                }
+            }
+
+            interface Face {
+                void m();
+            }
+            """;
+
     public static void main(String[] args) throws Exception {
         new LambdaTestStrictFPFlag().run();
     }
 
     void run() throws Exception {
-        ClassFile cf = getClassFile("LambdaTestStrictFPFlag$Test.class");
-        ConstantPool cp = cf.constant_pool;
+        Path src = Path.of("src");
+        Path out = Path.of("out");
+
+        ToolBox toolBox = new ToolBox();
+        toolBox.writeJavaFiles(src, SOURCE);
+        CompilerUtils.compile(src, out, "--release", "16");
+
+        ClassModel cm = ClassFile.of().parse(out.resolve("Test.class"));
         boolean found = false;
-        for (Method meth: cf.methods) {
-            if (meth.getName(cp).startsWith("lambda$")) {
-                if ((meth.access_flags.flags & AccessFlags.ACC_STRICT) == 0) {
+        for (MethodModel meth: cm.methods()) {
+            if (meth.methodName().stringValue().startsWith("lambda$")) {
+                if ((meth.flags().flagsMask() & ClassFile.ACC_STRICT) == 0){
                     throw new Exception("strict flag missing from lambda");
                 }
                 found = true;
@@ -55,41 +77,4 @@ void run() throws Exception {
             throw new Exception("did not find lambda method");
         }
     }
-
-// this version of the code can be used when ClassFile API in not in a preview
-//    void run() throws Exception {
-//        ClassModel cm = getClassFile("LambdaTestStrictFPFlag$Test.class");
-//        boolean found = false;
-//        for (MethodModel meth: cm.methods()) {
-//            if (meth.methodName().stringValue().startsWith("lambda$")) {
-//                if ((meth.flags().flagsMask() & ClassFile.ACC_STRICT) == 0){
-//                    throw new Exception("strict flag missing from lambda");
-//                }
-//                found = true;
-//            }
-//        }
-//        if (!found) {
-//            throw new Exception("did not find lambda method");
-//        }
-//    }
-
-    ClassFile getClassFile(String name) throws IOException, ConstantPoolException {
-        URL url = getClass().getResource(name);
-        InputStream in = url.openStream();
-        try {
-            return ClassFile.read(in);
-        } finally {
-            in.close();
-        }
-    }
-
-    class Test {
-        strictfp void test() {
-            Face itf = () -> { };
-        }
-    }
-
-    interface Face {
-        void m();
-    }
 }
diff --git a/test/langtools/tools/javac/lexer/CommentTest.java b/test/langtools/tools/javac/lexer/CommentTest.java
new file mode 100644
index 00000000000..c89c9eef1e6
--- /dev/null
+++ b/test/langtools/tools/javac/lexer/CommentTest.java
@@ -0,0 +1,524 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8298405
+ * @summary Proper lexing of comments, especially /// comments
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.parser
+ *          jdk.compiler/com.sun.tools.javac.util
+ * @build toolbox.TestRunner
+ * @run main CommentTest
+ */
+
+import java.util.Objects;
+
+import com.sun.tools.javac.parser.ScannerFactory;
+import com.sun.tools.javac.parser.Tokens;
+import com.sun.tools.javac.util.Context;
+
+import toolbox.TestRunner;
+
+public class CommentTest extends TestRunner {
+    public static void main(String... args) throws Exception {
+        new CommentTest().runTests();
+    }
+
+    CommentTest() {
+        super(System.err);
+    }
+
+    /**
+     * Control: a simple comment with no blank lines or incidental whitespace.
+     */
+    @Test
+    public void testControl() {
+        test("""
+                [
+
+                ///abc
+                ///def
+                ///ghi
+
+                ]
+                """, """
+                abc
+                def
+                ghi""");
+    }
+
+    /**
+     * Whitespace before the comment is completely ignored.
+     */
+    @Test
+    public void testRaggedInitialIndent() {
+        test("""
+                [
+
+                  ///abc
+                      ///def
+                    ///ghi
+
+                ]
+                """, """
+                abc
+                def
+                ghi""");
+    }
+
+    /**
+     * Leading blank lines are preserved.
+     */
+    @Test
+    public void testLeadingBlankLine_1() {
+        test("""
+                [
+
+                  ///
+                  ///abc
+                  ///def
+                  ///ghi
+
+                ]
+                """, """
+
+                abc
+                def
+                ghi""");
+    }
+
+    /**
+     * Leading blank lines do not affect the amount of incidental whitespace.
+     */
+    @Test
+    public void testLeadingBlankLine_2() {
+        test("""
+                [
+
+                  ///
+                  ///    abc
+                  ///    def
+                  ///    ghi
+
+                ]
+                """, """
+
+                abc
+                def
+                ghi""");
+    }
+
+    /**
+     * Inner blank lines are preserved.
+     */
+    @Test
+    public void testInnerBlankLine_1() {
+        test("""
+                [
+
+                  ///abc
+                  ///
+                  ///def
+                  ///ghi
+
+                ]
+                """, """
+                abc
+
+                def
+                ghi""");
+    }
+
+    /**
+     * Inner blank lines do not affect the amount of incidental whitespace.
+     */
+    @Test
+    public void testInnerBlankLine_2() {
+        test("""
+                [
+
+                  ///    abc
+                  ///
+                  ///    def
+                  ///    ghi
+
+                ]
+                """, """
+                abc
+
+                def
+                ghi""");
+    }
+
+    /**
+     * Inner blank lines do not affect the amount of incidental whitespace,
+     * but may have whitespace removed, perhaps resulting in an empty line.
+     */
+    @Test
+    public void testInnerBlankLine_3() {
+        test("""
+                [
+
+                  ///    abc
+                  ///  \s
+                  ///    def
+                  ///    ghi
+
+                ]
+                """, """
+                abc
+
+                def
+                ghi""");
+    }
+
+    /**
+     * Inner blank lines do not affect the amount of incidental whitespace,
+     * but may have whitespace removed.
+     */
+    @Test
+    public void testInnerBlankLine_4() {
+        test("""
+                [
+
+                  ///    abc
+                  ///          \s
+                  ///    def
+                  ///    ghi
+
+                ]
+                """, """
+                abc
+                      \s
+                def
+                ghi""");
+    }
+
+    /**
+     * Trailing blank lines are preserved.
+     */
+    @Test
+    public void testTrailingBlankLine_1() {
+        test("""
+                [
+
+                  ///abc
+                  ///def
+                  ///ghi
+                  ///
+
+                ]
+                """, """
+                abc
+                def
+                ghi
+                """);
+    }
+
+    /**
+     * Trailing blank lines do not affect the amount of incidental whitespace.
+     */
+    @Test
+    public void testTrailingBlankLine_2() {
+        test("""
+                [
+
+                  ///    abc
+                  ///    def
+                  ///    ghi
+                  ///
+
+                ]
+                """, """
+                abc
+                def
+                ghi
+                """);
+    }
+
+    /**
+     * Small amounts of incidental whitespace are removed.
+     */
+    @Test
+    public void testIncidental_small() {
+        test("""
+                [
+
+                /// abc
+                /// def
+                /// ghi
+
+                ]
+                """, """
+                abc
+                def
+                ghi""");
+    }
+
+    /**
+     * Large amounts of incidental whitespace are removed.
+     */
+    @Test
+    public void testIncidental_large() {
+        test("""
+                [
+
+                ///        abc
+                ///        def
+                ///        ghi
+
+                ]
+                """, """
+                abc
+                def
+                ghi""");
+    }
+
+    /**
+     * Additional leading whitespace may remain after incidental whitespace is removed.
+     */
+    @Test
+    public void testIncidental_mixed() {
+        test("""
+                [
+
+                ///        abc
+                ///            def
+                ///          ghi
+
+                ]
+                """, """
+                abc
+                    def
+                  ghi""");
+    }
+
+    /**
+     * Tabs and spaces are treated equally, as whitespace characters.
+     */
+    @Test
+    public void testIncidental_withTabs() {
+        test("""
+                [
+
+                ///        abc
+                ///\t       def
+                ///\t\t      ghi
+
+                ]
+                """, """
+                abc
+                def
+                ghi""");
+    }
+
+    /**
+     * Leading tabs may remain after incidental whitespace is removed.
+     */
+    @Test
+    public void testTabAfterIncidental() {
+        test("""
+                [
+
+                ///        abc
+                ///        \tdef
+                ///        ghi
+
+                ]
+                """, """
+                abc
+                \tdef
+                ghi""");
+    }
+
+    /**
+     * Trailing spaces are never removed.
+     */
+    @Test
+    public void testTrailingSpaces() {
+        test("""
+                [
+
+                ///abc
+                ///def    \s
+                ///ghi
+
+                ]
+                """, """
+                abc
+                def    \s
+                ghi""");
+
+    }
+
+    /**
+     * Trailing tabs are never removed.
+     */
+    @Test
+    public void testTrailingTabs() {
+        test("""
+                [
+
+                ///abc
+                ///def    \t
+                ///ghi
+
+                ]
+                """, """
+                abc
+                def    \t
+                ghi""");
+
+    }
+
+    /**
+     * Tabs may appear in incidental whitespace, and may remain in the leading
+     * whitespace after incidental whitespace is removed.
+     */
+    @Test
+    public void testMixedTabs() {
+        test("""
+                [
+
+                ///\t \t abc
+                ///\t \t \tdef
+                ///\t \t ghi
+
+                ]
+                """, """
+                abc
+                \tdef
+                ghi""");
+
+    }
+
+    /**
+     * A blank line between two /// comments is significant, and separates the two comments.
+     */
+    @Test
+    public void testMultipleComments() {
+        // When there is more than one comment, the most recent comment is first in the list
+        // stored in the token.
+        //
+        // (For JavaDoc, only the most recent comment is used; any preceding comments are ignored.)
+        test("""
+                [
+
+                ///abc
+
+                ///ghi
+
+                ]
+                """, """
+                ghi""", """
+                abc""");
+
+    }
+
+    /**
+     * An example of pseudo-typical Markdown, containing various Markdown constructs,
+     * like lists and code blocks.
+     */
+    @Test
+    public void testSampleMarkdown() {
+        test("""
+                [
+
+                /// Lorem ipsum dolor sit amet,
+                /// consectetur adipiscing elit.
+                ///
+                /// * item 1
+                /// * item 2
+                ///
+                /// ```
+                /// fenced code block
+                /// ```
+                ///
+                /// Ut enim ad minim veniam, quis nostrud
+                /// exercitation ullamco laboris nisi ut
+                /// aliquip ex ea commodo consequat.
+                ///
+                ///     indented code block
+                ///     ...
+                ///
+                /// Duis aute irure dolor in reprehenderit
+                /// in voluptate velit esse cillum dolore
+                /// eu fugiat nulla pariatur.
+                ]
+                """, """
+                Lorem ipsum dolor sit amet,
+                consectetur adipiscing elit.
+
+                * item 1
+                * item 2
+
+                ```
+                fenced code block
+                ```
+
+                Ut enim ad minim veniam, quis nostrud
+                exercitation ullamco laboris nisi ut
+                aliquip ex ea commodo consequat.
+
+                    indented code block
+                    ...
+
+                Duis aute irure dolor in reprehenderit
+                in voluptate velit esse cillum dolore
+                eu fugiat nulla pariatur.""");
+
+    }
+
+    private void test(String input, String... expect) {
+        var ctx = new Context();
+        var sf = ScannerFactory.instance(ctx);
+        var s = sf.newScanner(input, true);
+        s. nextToken();
+        var skipToken = s.token();
+        checkEqual(skipToken.kind, Tokens.TokenKind.LBRACKET);
+
+        s.nextToken();
+        var t = s.token();
+        var comments = t.comments;
+        if (comments == null) {
+            error("no comments");
+        } else if (comments.size() == expect.length) {
+            for (var i = 0; i < comments.size(); i++) {
+                checkEqual(comments.get(i).getText(), expect[i]);
+            }
+        } else {
+            error("Unexpected comments: " + comments);
+            out.println("  expected " + expect.length + " comments");
+            out.println("     found " + comments.size() + " comments");
+        }
+    }
+
+    private void checkEqual(Object found, Object expect) {
+        if (!Objects.equals(found, expect)) {
+            error("mismatch");
+            out.println("  expect: " + String.valueOf(expect).replace("\n", "|"));
+            out.println("   found: " + String.valueOf(found).replace("\n", "|"));
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/tools/javac/lib/DPrinter.java b/test/langtools/tools/javac/lib/DPrinter.java
index 19a70dff87a..6fa2f17dc67 100644
--- a/test/langtools/tools/javac/lib/DPrinter.java
+++ b/test/langtools/tools/javac/lib/DPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1107,6 +1107,11 @@ public Void visitProvides(ProvidesTree node, Void p) {
             return visitBlockTag(node, null);
         }
 
+        public Void visitRawText(RawTextTree node, Void p) {
+            printLimitedEscapedString("content", node.getContent());
+            return visitTree(node, null);
+        }
+
         public Void visitReference(ReferenceTree node, Void p) {
             printString("signature", node.getSignature());
             return visitTree(node, null);
diff --git a/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java b/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java
index cf06bd06dfe..24c2b045800 100644
--- a/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java
+++ b/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java
@@ -799,7 +799,7 @@ public void testPackagesUniquelyVisibleInImportOnDemandNoPrefixes(Path base) thr
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         List<String> expected = Arrays.asList(
-                "Test.java:1:31: compiler.err.doesnt.exist: ma",
+                "Test.java:1:38: compiler.err.doesnt.exist: ma",
                 "1 error");
 
         if (!expected.equals(log))
@@ -827,7 +827,7 @@ public void testPackagesUniquelyVisibleInImportOnDemandThisModule(Path base) thr
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         List<String> expected = Arrays.asList(
-                "Test.java:1:15: compiler.err.doesnt.exist: ma",
+                "Test.java:1:22: compiler.err.doesnt.exist: ma",
                 "1 error");
 
         if (!expected.equals(log))
@@ -861,7 +861,7 @@ public void testPackagesUniquelyVisibleInImportOnDemandThisModuleUnnamed(Path ba
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         List<String> expected = Arrays.asList(
-                "Test.java:1:15: compiler.err.doesnt.exist: ma",
+                "Test.java:1:22: compiler.err.doesnt.exist: ma",
                 "1 error");
 
         if (!expected.equals(log))
diff --git a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java
index 4186b83f2f1..3d47c4ac9bc 100644
--- a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java
+++ b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8304487 8325653
+ * @bug 8304487 8325653 8332463
  * @summary Compiler Implementation for Primitive types in patterns, instanceof, and switch (Preview)
  * @enablePreview
  * @compile/fail/ref=PrimitivePatternsSwitchErrors.out -XDrawDiagnostics -XDshould-stop.at=FLOW PrimitivePatternsSwitchErrors.java
@@ -59,7 +59,7 @@ public static int dominationBetweenBoxedAndPrimitive() {
         int i = 42;
         return switch (i) {
             case Integer ib  -> ib;
-            case byte ip     -> ip; // Error - dominated!
+            case byte ip     -> ip; // OK - not dominated!
         };
     }
 
diff --git a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.out b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.out
index 1cbf288e774..75fd62016a0 100644
--- a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.out
+++ b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.out
@@ -1,7 +1,6 @@
 PrimitivePatternsSwitchErrors.java:15:18: compiler.err.pattern.dominated
 PrimitivePatternsSwitchErrors.java:24:18: compiler.err.pattern.dominated
 PrimitivePatternsSwitchErrors.java:31:24: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.Long)
-PrimitivePatternsSwitchErrors.java:62:18: compiler.err.pattern.dominated
 PrimitivePatternsSwitchErrors.java:70:18: compiler.err.pattern.dominated
 PrimitivePatternsSwitchErrors.java:78:18: compiler.err.pattern.dominated
 PrimitivePatternsSwitchErrors.java:84:18: compiler.err.prob.found.req: (compiler.misc.possible.loss.of.precision: long, byte)
@@ -44,4 +43,4 @@ PrimitivePatternsSwitchErrors.java:254:16: compiler.err.not.exhaustive
 PrimitivePatternsSwitchErrors.java:260:16: compiler.err.not.exhaustive
 - compiler.note.preview.filename: PrimitivePatternsSwitchErrors.java, DEFAULT
 - compiler.note.preview.recompile
-44 errors
+43 errors
\ No newline at end of file
diff --git a/test/langtools/tools/javac/patterns/T8332463a.java b/test/langtools/tools/javac/patterns/T8332463a.java
new file mode 100644
index 00000000000..96aaad86a85
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/T8332463a.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8332463
+ * @summary Byte conditional pattern case element dominates short constant case element
+ * @compile --enable-preview --source ${jdk.version} T8332463a.java
+ */
+public class T8332463a {
+    public int test2() {
+        Byte i = (byte) 42;
+        return switch (i) {
+            case Byte ib  -> 1;
+            case short s  -> 2;
+        };
+    }
+
+    public int test4() {
+        int i = 42;
+        return switch (i) {
+            case Integer ib -> 1;
+            case byte ip    -> 2;
+        };
+    }
+
+    public int test3() {
+        int i = 42;
+        return switch (i) {
+            case Integer ib -> 1;
+            case (byte) 0   -> 2;
+        };
+    }
+}
diff --git a/test/langtools/tools/javac/patterns/T8332463b.java b/test/langtools/tools/javac/patterns/T8332463b.java
new file mode 100644
index 00000000000..7956fd31f9f
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/T8332463b.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8332463
+ * @summary Byte conditional pattern case element dominates short constant case element
+ * @enablePreview
+ * @compile T8332463b.java
+ *  @compile --enable-preview --source ${jdk.version} T8332463b.java
+ */
+public class T8332463b {
+    public int test1() {
+        Byte i = (byte) 42;
+        return switch (i) {
+            case Byte ib   -> 1;
+            case (short) 0 -> 2;
+        };
+    }
+}
diff --git a/test/langtools/tools/javac/processing/RecordGenerationTest.java b/test/langtools/tools/javac/processing/RecordGenerationTest.java
new file mode 100644
index 00000000000..9ee28d264cb
--- /dev/null
+++ b/test/langtools/tools/javac/processing/RecordGenerationTest.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8332297
+ * @summary annotation processor that generates records sometimes fails due to NPE in javac
+ * @library /tools/lib /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ * @build toolbox.ToolBox toolbox.JavacTask toolbox.Task
+ * @build RecordGenerationTest JavacTestingAbstractProcessor
+ * @run main RecordGenerationTest
+ */
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Set;
+
+import javax.annotation.processing.FilerException;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedOptions;
+import javax.annotation.processing.SupportedAnnotationTypes;
+
+import javax.lang.model.element.TypeElement;
+import javax.tools.StandardLocation;
+
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
+public class RecordGenerationTest {
+    public static void main(String... args) throws Exception {
+        new RecordGenerationTest().run();
+    }
+
+    Path[] findJavaFiles(Path... paths) throws Exception {
+        return tb.findJavaFiles(paths);
+    }
+
+    ToolBox tb = new ToolBox();
+
+    void run() throws Exception {
+        Path allInOne = Paths.get("allInOne");
+        if (Files.isDirectory(allInOne)) {
+            tb.cleanDirectory(allInOne);
+        }
+        Files.deleteIfExists(allInOne);
+        tb.createDirectories(allInOne);
+
+        tb.writeJavaFiles(allInOne,
+                """
+                import java.io.IOException;
+                import java.io.OutputStream;
+                import java.io.Writer;
+                import java.nio.file.Files;
+                import java.nio.file.Path;
+                import java.nio.file.Paths;
+                import java.util.Set;
+
+                import javax.annotation.processing.AbstractProcessor;
+                import javax.annotation.processing.FilerException;
+                import javax.annotation.processing.RoundEnvironment;
+                import javax.annotation.processing.SupportedOptions;
+                import javax.annotation.processing.SupportedAnnotationTypes;
+
+                import javax.lang.model.element.TypeElement;
+                import javax.tools.StandardLocation;
+
+                @SupportedAnnotationTypes("*")
+                public class AP extends AbstractProcessor {
+                    @Override
+                    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+                        if (roundEnv.processingOver()) {
+                            try (Writer w = processingEnv.getFiler().createSourceFile("ConfRecord").openWriter()) {
+                                w.append("@RecordBuilder public record ConfRecord(int maxConcurrency) implements Conf {}");
+                            } catch (IOException ex) {
+                                throw new IllegalStateException(ex);
+                            }
+                        }
+                        return true;
+                    }
+                }
+                """
+        );
+
+        new JavacTask(tb).options("-d", allInOne.toString())
+                .files(findJavaFiles(allInOne))
+                .run()
+                .writeAll();
+
+        tb.writeJavaFiles(allInOne,
+                """
+                interface Conf {
+                    int maxConcurrency( );
+                }
+                """,
+                """
+                import java.lang.annotation.*;
+                public @interface RecordBuilder {
+                }
+                """
+        );
+
+        Path confSource = Paths.get(allInOne.toString(), "Conf.java");
+        new JavacTask(tb).options("-processor", "AP",
+                "-cp", allInOne.toString(),
+                "-d", allInOne.toString())
+                .files(confSource)
+                .run()
+                .writeAll();
+
+        /* the bug reported at JDK-8332297 was reproducible only every other time this is why we reproduce
+         * the same compilation command as above basically the second time the compiler is completing the
+         * record symbol from the class file produced during the first compilation
+         */
+        new JavacTask(tb).options("-processor", "AP",
+                "-cp", allInOne.toString(),
+                "-d", allInOne.toString())
+                .files(confSource)
+                .run()
+                .writeAll();
+    }
+}
diff --git a/test/langtools/tools/javac/processing/model/util/elements/TestGetDocCommentKind.java b/test/langtools/tools/javac/processing/model/util/elements/TestGetDocCommentKind.java
new file mode 100644
index 00000000000..da5d65c5232
--- /dev/null
+++ b/test/langtools/tools/javac/processing/model/util/elements/TestGetDocCommentKind.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8307184
+ * @summary Test basic operation of Elements.getDocCommentKind
+ * @library /tools/lib /tools/javac/lib
+ * @build   toolbox.ToolBox JavacTestingAbstractProcessor TestGetDocCommentKind
+ * @compile -processor TestGetDocCommentKind -proc:only TestGetDocCommentKind.java
+ */
+
+import java.util.*;
+import javax.annotation.processing.*;
+import javax.lang.model.element.*;
+import javax.lang.model.util.*;
+import javax.lang.model.util.Elements.DocCommentKind;
+
+public class TestGetDocCommentKind extends JavacTestingAbstractProcessor {
+    final Elements vacuousElements = new VacuousElements();
+
+    public boolean process(Set<? extends TypeElement> annotations,
+                           RoundEnvironment roundEnv) {
+        if (!roundEnv.processingOver()) {
+            boolean elementSeen = false;
+
+            for (TypeElement typeRoot : ElementFilter.typesIn(roundEnv.getRootElements()) ) {
+                for (Element element : typeRoot.getEnclosedElements()) {
+                    ExpectedKind expectedKind = element.getAnnotation(ExpectedKind.class);
+                    if (expectedKind != null ) {
+                        elementSeen = true;
+
+                        checkKind(element, elements, expectedKind.value());
+                        checkKind(element, vacuousElements, null);
+                    }
+                }
+
+                if (!elementSeen) {
+                    throw new RuntimeException("No elements seen.");
+                }
+            }
+        }
+        return true;
+    }
+
+    void checkKind(Element e, Elements elementUtils, DocCommentKind expectedKind) {
+        var actualKind = elementUtils.getDocCommentKind(e);
+        if (actualKind != expectedKind) {
+            messager.printError("Unexpected doc comment kind found: " + actualKind
+                    + "expected: " + expectedKind, e);
+        }
+    }
+
+    @interface ExpectedKind {
+        DocCommentKind value();
+    }
+
+    /**
+     * Traditional comment.
+     */
+    @ExpectedKind(DocCommentKind.TRADITIONAL)
+    public void traditionalComment() { }
+
+    /// End-of-line comment.
+    @ExpectedKind(DocCommentKind.END_OF_LINE)
+    public void endOfLineComment() { }
+}
diff --git a/test/langtools/tools/javac/processing/model/util/elements/TestGetDocComments.java b/test/langtools/tools/javac/processing/model/util/elements/TestGetDocComment_Block.java
similarity index 94%
rename from test/langtools/tools/javac/processing/model/util/elements/TestGetDocComments.java
rename to test/langtools/tools/javac/processing/model/util/elements/TestGetDocComment_Block.java
index 25a41b34205..972766eb160 100644
--- a/test/langtools/tools/javac/processing/model/util/elements/TestGetDocComments.java
+++ b/test/langtools/tools/javac/processing/model/util/elements/TestGetDocComment_Block.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,24 +24,22 @@
 /*
  * @test
  * @bug 8307184
- * @summary Test basic operation of Elements.getDocComments
+ * @summary Test basic operation of Elements.getDocComment
  * @library /tools/lib /tools/javac/lib
- * @build   toolbox.ToolBox JavacTestingAbstractProcessor TestGetDocComments
- * @compile -processor TestGetDocComments -proc:only TestGetDocComments.java
+ * @build   toolbox.ToolBox JavacTestingAbstractProcessor TestGetDocComment_Block
+ * @compile -processor TestGetDocComment_Block -proc:only TestGetDocComment_Block.java
  */
 
-import java.io.Writer;
 import java.util.*;
-import java.util.function.*;
 import javax.annotation.processing.*;
 import javax.lang.model.element.*;
 import javax.lang.model.util.*;
 import toolbox.ToolBox;
 
 /**
- * Test basic workings of Elements.getDocComments
+ * Test basic operation of Elements.getDocComment for block comments
  */
-public class TestGetDocComments extends JavacTestingAbstractProcessor {
+public class TestGetDocComment_Block extends JavacTestingAbstractProcessor {
     public boolean process(Set<? extends TypeElement> annotations,
                            RoundEnvironment roundEnv) {
         if (!roundEnv.processingOver()) {
diff --git a/test/langtools/tools/javac/processing/model/util/elements/TestGetDocComment_Line.java b/test/langtools/tools/javac/processing/model/util/elements/TestGetDocComment_Line.java
new file mode 100644
index 00000000000..d170a84bd28
--- /dev/null
+++ b/test/langtools/tools/javac/processing/model/util/elements/TestGetDocComment_Line.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8307184
+ * @summary Test basic operation of Elements.getDocComment
+ * @library /tools/lib /tools/javac/lib
+ * @build   toolbox.ToolBox JavacTestingAbstractProcessor TestGetDocComment_Line
+ * @compile -processor TestGetDocComment_Line -proc:only TestGetDocComment_Line.java
+ */
+
+import java.util.Set;
+
+import javax.annotation.processing.RoundEnvironment;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.util.ElementFilter;
+
+import toolbox.ToolBox;
+
+/**
+ * Test basic operation of Elements.getDocComment for line comments
+ */
+public class TestGetDocComment_Line extends JavacTestingAbstractProcessor {
+    public boolean process(Set<? extends TypeElement> annotations,
+                           RoundEnvironment roundEnv) {
+        if (!roundEnv.processingOver()) {
+            boolean elementSeen = false;
+
+            for (TypeElement typeRoot : ElementFilter.typesIn(roundEnv.getRootElements()) ) {
+                for (Element element : typeRoot.getEnclosedElements()) {
+                    ExpectedComment expectedComment = element.getAnnotation(ExpectedComment.class);
+                    if (expectedComment != null ) {
+                        elementSeen = true;
+                        String expectedCommentStr = expectedComment.value();
+                        String actualComment = elements.getDocComment(element);
+
+                        if (!expectedCommentStr.equals(actualComment)) {
+                            messager.printError("Unexpected doc comment found", element);
+                            System.err.println("expect>>" + expectedCommentStr + "<<");
+                            System.err.println("actual>>" + actualComment + "<<");
+                            (new ToolBox()).checkEqual(expectedCommentStr.lines().toList(),
+                                                       actualComment.lines().toList());
+                        }
+                    }
+                }
+
+                if (!elementSeen) {
+                    throw new RuntimeException("No elements seen.");
+                }
+            }
+        }
+        return true;
+    }
+
+    @interface ExpectedComment {
+        String value();
+    }
+
+    // Basic processing of interior lines
+    ///Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+    ///eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+    ///enim ad minim veniam, quis nostrud exercitation ullamco laboris
+    ///nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor
+    ///in reprehenderit in voluptate velit esse cillum dolore eu
+    ///fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+    ///proident, sunt in culpa qui officia deserunt mollit anim id est
+    ///laborum.
+    @ExpectedComment("""
+     Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+     eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+     enim ad minim veniam, quis nostrud exercitation ullamco laboris
+     nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor
+     in reprehenderit in voluptate velit esse cillum dolore eu
+     fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+     proident, sunt in culpa qui officia deserunt mollit anim id est
+     laborum.""")
+    // End-of-line-style comment
+    @SuppressWarnings("") // A second preceding annotation
+    /* Traditional comment */
+    private void foo() {return ;}
+
+
+    // Check removal of space characters;
+    // excess / characters are not removed
+    // use Unicode escape to test tab removal
+///Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+////eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+/////enim ad minim veniam, quis nostrud exercitation ullamco laboris
+//////nisi ut aliquip ex ea commodo consequat.
+ \u0009///Duis aute irure dolor in reprehenderit in voluptate velit esse
+ ////cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
+  /////cupidatat non proident, sunt in culpa qui officia deserunt mollit
+                                            ///anim id est laborum.
+    @ExpectedComment("""
+       Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+       /eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+       //enim ad minim veniam, quis nostrud exercitation ullamco laboris
+       ///nisi ut aliquip ex ea commodo consequat.
+       Duis aute irure dolor in reprehenderit in voluptate velit esse
+       /cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
+       //cupidatat non proident, sunt in culpa qui officia deserunt mollit
+       anim id est laborum.""")
+    @SuppressWarnings("") // A second preceding annotation
+    // End-of-line-style comment
+    /*
+     * Traditional comment over multiple lines.
+     */
+    private void bar() {return ;}
+
+    // Incidental whitespace _after_ the /// prefix is deleted;
+    // additional indentation is _not_ deleted
+    ///  Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+    ///  eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+    ///   enim ad minim veniam, quis nostrud exercitation ullamco laboris
+    ///    nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor
+    ///     in reprehenderit in voluptate velit esse cillum dolore eu
+    ///  fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+    ///  proident, sunt in culpa qui officia deserunt mollit anim id est
+    ///  laborum.
+    @ExpectedComment("""
+     Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+     eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+      enim ad minim veniam, quis nostrud exercitation ullamco laboris
+       nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor
+        in reprehenderit in voluptate velit esse cillum dolore eu
+     fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+     proident, sunt in culpa qui officia deserunt mollit anim id est
+     laborum.""")
+    private void baz() {return ;}
+
+    // Incidental space after /// is removed, but not space at the end of the line
+    ///   Totality\u0020
+    @ExpectedComment("Totality ")
+    private void quux() {return ;}
+
+    ///
+    @ExpectedComment("")
+    private void empty() {return ;}
+
+    /// tail\u0020
+    @ExpectedComment("tail ")
+    private void tail() {return ;}
+
+    // Testing of line terminators, javac implementation normalizes them:
+    // * newline: \u000A
+    // * carriage return: \u000D
+    // * * carriage return + newline: \u000D\u000A
+    /// Lorem\u000A/// \u000D/// \u000D\u000A/// ipsum
+    @ExpectedComment("Lorem\n\n\nipsum")
+    private void wombat2() {return ;}
+}
diff --git a/test/langtools/tools/javap/T6866657.java b/test/langtools/tools/javap/T6866657.java
index c935d4747f8..0b46cd07f66 100644
--- a/test/langtools/tools/javap/T6866657.java
+++ b/test/langtools/tools/javap/T6866657.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,10 @@
  * @test
  * @bug 6866657
  * @summary add byteLength() method to primary classfile types
- * @modules jdk.jdeps/com.sun.tools.classfile
- *          jdk.jdeps/com.sun.tools.javap
+ * @modules jdk.jdeps/com.sun.tools.javap
  */
 
 import java.io.*;
-import java.util.*;
 import javax.tools.*;
 import com.sun.tools.javap.*;
 
diff --git a/test/langtools/tools/javap/T7186925.java b/test/langtools/tools/javap/T7186925.java
index 2d4553526b1..dcbe8af10ba 100644
--- a/test/langtools/tools/javap/T7186925.java
+++ b/test/langtools/tools/javap/T7186925.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,9 @@
  * @test
  * @bug 7186925
  * @summary JavapTask passes null to java.io.Writer
- * @modules jdk.jdeps/com.sun.tools.classfile
- *          jdk.jdeps/com.sun.tools.javap
+ * @modules jdk.jdeps/com.sun.tools.javap
  */
 
-import java.io.*;
-import java.util.*;
 import javax.tools.*;
 import com.sun.tools.javap.*;
 
diff --git a/test/langtools/tools/javap/classfile/deps/GetDeps.java b/test/langtools/tools/javap/classfile/deps/GetDeps.java
index 5165e6611f9..c21d010b5be 100644
--- a/test/langtools/tools/javap/classfile/deps/GetDeps.java
+++ b/test/langtools/tools/javap/classfile/deps/GetDeps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,16 @@
  */
 
 import java.io.*;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
 import java.util.*;
 import java.util.regex.Pattern;
 import javax.tools.*;
 
-import com.sun.tools.classfile.*;
-import com.sun.tools.classfile.Dependencies.*;
-import com.sun.tools.classfile.Dependency.Location;
+import com.sun.tools.jdeps.Dependencies;
+import com.sun.tools.jdeps.Dependencies.*;
+import com.sun.tools.jdeps.Dependency;
+import com.sun.tools.jdeps.Dependency.Location;
 import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.tools.javac.util.Context;
 
@@ -140,7 +143,7 @@ static class ClassFileReader implements Dependencies.ClassFileReader {
         }
 
         @Override
-        public ClassFile getClassFile(String className) throws ClassFileNotFoundException {
+        public ClassModel getClassFile(String className) throws ClassFileNotFoundException {
             try {
                 JavaFileObject fo = fm.getJavaFileForInput(
                         StandardLocation.CLASS_PATH, className, JavaFileObject.Kind.CLASS);
@@ -151,11 +154,11 @@ public ClassFile getClassFile(String className) throws ClassFileNotFoundExceptio
                     throw new ClassFileNotFoundException(className);
                 InputStream in = fo.openInputStream();
                 try {
-                    return ClassFile.read(in);
+                    return ClassFile.of().parse(in.readAllBytes());
                 } finally {
                     in.close();
                 }
-            } catch (ConstantPoolException e) {
+            } catch (IllegalArgumentException e) {
                 throw new ClassFileNotFoundException(className, e);
             } catch (IOException e) {
                 throw new ClassFileNotFoundException(className, e);
diff --git a/test/langtools/tools/javap/classfile/deps/T6907575.java b/test/langtools/tools/javap/classfile/deps/T6907575.java
index 81d80d95847..49019d4f870 100644
--- a/test/langtools/tools/javap/classfile/deps/T6907575.java
+++ b/test/langtools/tools/javap/classfile/deps/T6907575.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,10 @@
 /*
  * @test
  * @bug 6907575
- * @modules jdk.jdeps/com.sun.tools.classfile
+ * @modules jdk.jdeps/com.sun.tools.jdeps
  *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
+ * @enablePreview
  * @build GetDeps p.C1
  * @run main T6907575
  */
diff --git a/test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestMethodSig.java b/test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestMethodSig.java
deleted file mode 100644
index e44b8b2e133..00000000000
--- a/test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestMethodSig.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @summary Simple tests for method signature parsing
- * @modules jdk.jdeps/com.sun.tools.jdeprscan.scan
- * @build TestMethodSig
- * @run testng jdk.jdeprscan.TestMethodSig
- */
-
-package jdk.jdeprscan;
-
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
-import static com.sun.tools.jdeprscan.scan.MethodSig.fromDesc;
-
-public class TestMethodSig {
-    @Test
-    public void testSimple() {
-        assertEquals(fromDesc("(Ljava/rmi/RMISecurityManager;)Ljava/lang/Object;").toString(),
-                     "parameters 0=Ljava/rmi/RMISecurityManager; return Ljava/lang/Object;");
-    }
-
-    @Test
-    public void testMultParamVoidReturn() {
-        assertEquals(fromDesc("([[IZLjava/lang/String;B[J)V").toString(),
-                     "parameters 0=[[I 1=Z 2=Ljava/lang/String; 3=B 4=[J return V");
-    }
-
-    @Test
-    public void testNoParams() {
-        assertEquals(fromDesc("()J").toString(),
-                     "parameters none return J");
-    }
-
-    @Test(expectedExceptions = IllegalArgumentException.class)
-    public void testMissingReturnType() {
-        fromDesc("(ISJZ)");
-    }
-}
diff --git a/test/langtools/tools/jdeps/APIDeps.java b/test/langtools/tools/jdeps/APIDeps.java
index 05b4bd2f3a5..826135fd532 100644
--- a/test/langtools/tools/jdeps/APIDeps.java
+++ b/test/langtools/tools/jdeps/APIDeps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @library lib
  * @modules java.base/sun.security.x509
  *          java.management
- *          jdk.jdeps/com.sun.tools.classfile
  *          jdk.jdeps/com.sun.tools.jdeps
  * @run main APIDeps
  */
@@ -104,17 +103,17 @@ int run() throws IOException {
              new String[] {"c.I", "e.E", "f.F", "m.Bar"},
              new String[] {"-classpath", testDir.getPath(), "-verbose:class", "-filter:none"});
         test(new File(mDir, "Gee.class"),
-             new String[] {"g.G", "sun.security.x509.X509CertInfo", "com.sun.tools.classfile.ClassFile",
+             new String[] {"g.G", "sun.security.x509.X509CertInfo", "com.sun.tools.jdeps.Analyzer",
                            "com.sun.management.ThreadMXBean", "com.sun.source.tree.BinaryTree"},
              new String[] {"-classpath", testDir.getPath(), "-verbose"});
 
         // -jdkinternals
         test(new File(mDir, "Gee.class"),
-             new String[] {"sun.security.x509.X509CertInfo", "com.sun.tools.classfile.ClassFile"},
+             new String[] {"sun.security.x509.X509CertInfo", "com.sun.tools.jdeps.Analyzer"},
              new String[] {"-jdkinternals", "-quiet"});
         // -jdkinternals parses all classes on -classpath and the input arguments
         test(new File(mDir, "Gee.class"),
-             new String[] {"com.sun.tools.classfile.ClassFile",
+             new String[] {"com.sun.tools.jdeps.Analyzer",
                            "sun.security.x509.X509CertInfo"},
              // use -classpath tmp/a with no use of JDK internal API
              new String[] {"-classpath", dest.resolve("a").toString(), "-jdkinternals", "-quiet"});
diff --git a/test/langtools/tools/jdeps/m/Gee.java b/test/langtools/tools/jdeps/m/Gee.java
index 194a30d7f1b..d1e56428acf 100644
--- a/test/langtools/tools/jdeps/m/Gee.java
+++ b/test/langtools/tools/jdeps/m/Gee.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 
 class Gee extends g.G {
     public sun.security.x509.X509CertInfo cert;
-    public com.sun.tools.classfile.ClassFile cf;     // not exported
+    public com.sun.tools.jdeps.Analyzer analyzer;     // not exported
     public com.sun.source.tree.BinaryTree tree;      // exported
     public com.sun.management.ThreadMXBean mxbean;   // exported
 }
diff --git a/test/lib/jdk/test/lib/process/OutputAnalyzer.java b/test/lib/jdk/test/lib/process/OutputAnalyzer.java
index 48a0b098d48..24bb18e3d4b 100644
--- a/test/lib/jdk/test/lib/process/OutputAnalyzer.java
+++ b/test/lib/jdk/test/lib/process/OutputAnalyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -665,7 +665,7 @@ public OutputAnalyzer shouldBeEmptyIgnoreVMWarnings() {
 
     /**
      * Verify that the stderr contents of output buffer matches the pattern,
-     * after filtering out the Hotespot warning messages
+     * after filtering out the Hotspot warning messages
      *
      * @param pattern
      * @throws RuntimeException If the pattern was not found
@@ -681,6 +681,24 @@ public OutputAnalyzer stderrShouldMatchIgnoreVMWarnings(String pattern) {
         return this;
     }
 
+    /**
+     * Verify that the stderr contents of output buffer matches the pattern,
+     * after filtering out the Hotspot deprecation warning messages
+     *
+     * @param pattern
+     * @throws RuntimeException If the pattern was not found
+     */
+    public OutputAnalyzer stderrShouldMatchIgnoreDeprecatedWarnings(String pattern) {
+        String stderr = getStderr().replaceAll(deprecatedmsg + "\\R", "");
+        Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
+        if (!matcher.find()) {
+            reportDiagnosticSummary();
+            throw new RuntimeException("'" + pattern
+                  + "' missing from stderr");
+        }
+        return this;
+    }
+
     /**
      * Returns the contents of the output buffer (stdout and stderr), without those
      * JVM warning msgs, as list of strings. Output is split by newlines.
diff --git a/test/micro/org/openjdk/bench/java/lang/constant/ClassDescFactories.java b/test/micro/org/openjdk/bench/java/lang/constant/ClassDescFactories.java
index c74271995d5..c9ce4a6c100 100644
--- a/test/micro/org/openjdk/bench/java/lang/constant/ClassDescFactories.java
+++ b/test/micro/org/openjdk/bench/java/lang/constant/ClassDescFactories.java
@@ -35,6 +35,7 @@
 import org.openjdk.jmh.annotations.Warmup;
 
 import java.lang.constant.ClassDesc;
+import java.lang.constant.ConstantDescs;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -60,4 +61,19 @@ public class ClassDescFactories {
     public ClassDesc ofDescriptor() {
         return ClassDesc.ofDescriptor(descString);
     }
+
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.NANOSECONDS)
+    @Warmup(iterations = 3, time = 2)
+    @Measurement(iterations = 6, time = 1)
+    @Fork(1)
+    @State(Scope.Thread)
+    public static class ReferenceOnly {
+        public ClassDesc desc = ConstantDescs.CD_Object;
+        @Benchmark
+        public ClassDesc ofNested() {
+            return desc.nested("Foo");
+        }
+
+    }
 }
diff --git a/test/micro/org/openjdk/bench/java/lang/constant/ClassDescMethods.java b/test/micro/org/openjdk/bench/java/lang/constant/ClassDescMethods.java
new file mode 100644
index 00000000000..8d9f686b013
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/constant/ClassDescMethods.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.lang.constant;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.lang.constant.ClassDesc;
+import java.lang.constant.ConstantDescs;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Test various operations on
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Warmup(iterations = 3, time = 2)
+@Measurement(iterations = 5, time = 1)
+@Fork(3)
+@State(Scope.Thread)
+public class ClassDescMethods {
+
+    @Benchmark
+    public String packageName() {
+        return ConstantDescs.CD_Object.packageName();
+    }
+
+    @Benchmark
+    public String displayName() {
+        return ConstantDescs.CD_Object.displayName();
+    }
+
+    @Benchmark
+    public void arrayType(Blackhole bh) {
+        bh.consume(ConstantDescs.CD_Object.arrayType());
+        bh.consume(ConstantDescs.CD_boolean.arrayType());
+    }
+
+    @Benchmark
+    public void arrayType1(Blackhole bh) {
+        bh.consume(ConstantDescs.CD_Object.arrayType(1));
+        bh.consume(ConstantDescs.CD_boolean.arrayType(1));
+    }
+
+    @Benchmark
+    public void arrayType2(Blackhole bh) {
+        bh.consume(ConstantDescs.CD_Object.arrayType(2));
+        bh.consume(ConstantDescs.CD_boolean.arrayType(2));
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/util/zip/InflaterInputStreams.java b/test/micro/org/openjdk/bench/java/util/zip/InflaterInputStreams.java
index ab6be0e9374..33704ad3f9f 100644
--- a/test/micro/org/openjdk/bench/java/util/zip/InflaterInputStreams.java
+++ b/test/micro/org/openjdk/bench/java/util/zip/InflaterInputStreams.java
@@ -108,7 +108,10 @@ public void beforeIteration() throws IOException {
     @Benchmark
     public void inflaterInputStreamRead() throws IOException {
         deflated.reset();
-        InflaterInputStream iis = new InflaterInputStream(deflated);
-        while (iis.read(inflated, 0, inflated.length) != -1);
+        // We close the InflaterInputStream to release underlying native resources of the Inflater.
+        // The "deflated" ByteArrayInputStream remains unaffected.
+        try (InflaterInputStream iis = new InflaterInputStream(deflated)) {
+            while (iis.read(inflated, 0, inflated.length) != -1);
+        }
     }
 }
diff --git a/test/micro/org/openjdk/bench/javax/crypto/full/PolynomialP256Bench.java b/test/micro/org/openjdk/bench/javax/crypto/full/PolynomialP256Bench.java
new file mode 100644
index 00000000000..94c247c9080
--- /dev/null
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/PolynomialP256Bench.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.javax.crypto.full;
+
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.annotations.Benchmark;
+import java.math.BigInteger;
+import java.util.concurrent.TimeUnit;
+import sun.security.util.math.intpoly.MontgomeryIntegerPolynomialP256;
+import sun.security.util.math.intpoly.IntegerPolynomialP256;
+import sun.security.util.math.MutableIntegerModuloP;
+import sun.security.util.math.ImmutableIntegerModuloP;
+
+@Fork(jvmArgsAppend = {"-XX:+AlwaysPreTouch",
+    "--add-exports", "java.base/sun.security.util.math.intpoly=ALL-UNNAMED",
+    "--add-exports", "java.base/sun.security.util.math=ALL-UNNAMED"}, value = 1)
+@Warmup(iterations = 3, time = 3)
+@Measurement(iterations = 8, time = 2)
+@OutputTimeUnit(TimeUnit.SECONDS)
+@State(Scope.Thread)
+@BenchmarkMode(Mode.Throughput)
+public class PolynomialP256Bench {
+    final MontgomeryIntegerPolynomialP256 montField = MontgomeryIntegerPolynomialP256.ONE;
+    final IntegerPolynomialP256 residueField = IntegerPolynomialP256.ONE;
+    final BigInteger refx =
+        new BigInteger("6b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c296", 16);
+    final ImmutableIntegerModuloP x = residueField.getElement(refx);
+    final ImmutableIntegerModuloP X = montField.getElement(refx);
+    final ImmutableIntegerModuloP one = montField.get1();
+
+    @Param({"true", "false"})
+    private boolean isMontBench;
+
+    @Benchmark
+    public MutableIntegerModuloP benchMultiply() {
+        MutableIntegerModuloP test;
+        if (isMontBench) {
+            test = X.mutable();
+        } else {
+            test = x.mutable();
+        }
+
+        for (int i = 0; i< 10000; i++) {
+            test = test.setProduct(test);
+        }
+        return test;
+    }
+
+    @Benchmark
+    public MutableIntegerModuloP benchSquare() {
+        MutableIntegerModuloP test;
+        if (isMontBench) {
+            test = X.mutable();
+        } else {
+            test = x.mutable();
+        }
+
+        for (int i = 0; i< 10000; i++) {
+            test = test.setSquare();
+        }
+        return test;
+    }
+
+    @Benchmark
+    public MutableIntegerModuloP benchAssign() {
+        MutableIntegerModuloP test1 = X.mutable();
+        MutableIntegerModuloP test2 = one.mutable();
+        for (int i = 0; i< 10000; i++) {
+            test1.conditionalSet(test2, 0);
+            test1.conditionalSet(test2, 1);
+            test2.conditionalSet(test1, 0);
+            test2.conditionalSet(test1, 1);
+        }
+        return test2;
+    }
+}